From d4886adcce52bfa5e992268cff15b1163ae2fdeb Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 12 Mar 2017 01:41:21 +0100 Subject: [PATCH 01/58] Fix dependency detection for latest images --- .../taskloader/BaseDockerTaskLoader.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/webdevops/taskloader/BaseDockerTaskLoader.py b/bin/webdevops/taskloader/BaseDockerTaskLoader.py index 969e399e4..37c75de0b 100644 --- a/bin/webdevops/taskloader/BaseDockerTaskLoader.py +++ b/bin/webdevops/taskloader/BaseDockerTaskLoader.py @@ -68,17 +68,10 @@ def process_dockerfile_list(self, dockerfile_list): Prepare dockerfile list with dependency and also add "auto latest tag" images """ - image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']] - + # Process auto latest tag autoLatestTagImageList = [] - + image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']] for dockerfile in dockerfile_list: - # Calculate dependency - dockerfile['dependency'] = False - if dockerfile['image']['from'] and dockerfile['image']['from'] in image_list: - dockerfile['dependency'] = dockerfile['image']['from'] - - # Process auto latest tag if self.configuration.get('docker.autoLatestTag') and dockerfile['image']['tag'] == self.configuration.get('docker.autoLatestTag'): imageNameLatest = DockerfileUtility.generate_image_name_with_tag_latest(dockerfile['image']['fullname']) if imageNameLatest not in image_list: @@ -87,10 +80,17 @@ def process_dockerfile_list(self, dockerfile_list): autoLatestTagImage['image']['tag'] = 'latest' autoLatestTagImage['dependency'] = dockerfile['image']['fullname'] autoLatestTagImageList.append(autoLatestTagImage) - # Add auto latest tag images to dockerfile list dockerfile_list.extend(autoLatestTagImageList) + # Calculate dependency + image_list = [x['image']['fullname'] for x in dockerfile_list if x['image']['fullname']] + for dockerfile in dockerfile_list: + if not 'dependency' in dockerfile: + dockerfile['dependency'] = False + if dockerfile['image']['from'] and dockerfile['image']['from'] in image_list: + dockerfile['dependency'] = dockerfile['image']['from'] + return dockerfile_list def generate_task_list(self, dockerfile_list): From 0146d008a25c8fa8f4b8b9db097abf28730c9005 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 26 Mar 2017 14:20:42 +0200 Subject: [PATCH 02/58] Merge feature/reduce-size * Improve generate-dockerimage-info * Add baselayout for typo3-solr * Implement Arch Linux support for baselayout * Remove lsb-release * Fix dependency detection for latest images * Remove logrotate * Improve bootstrap * Add transparent wrapper for apt-add-repository (automatic installation & deinstallation) * Add prefetched apt repository lists (cleanup in docker-image-cleanup; reduce load on debian and ubuntu repositories) * Reduze size for bootstrap * Add docker image cleanup script * Add static distribution information collection (for testsuite) --- baselayout/usr/local/bin/apt-add-repository | 8 ++ baselayout/usr/local/bin/apt-install | 20 ++-- baselayout/usr/local/bin/apt-update | 9 ++ baselayout/usr/local/bin/apt-upgrade | 20 ++-- baselayout/usr/local/bin/docker-image-cleanup | 35 +++++++ .../usr/local/bin/generate-dockerimage-info | 95 ++++++++++++++++++ baselayout/usr/local/bin/generate-locales | 12 ++- conf/provision.yml | 2 + docker/apache-dev/alpine-3/Dockerfile | 4 +- docker/apache-dev/centos-7/Dockerfile | 4 +- docker/apache-dev/debian-7/Dockerfile | 4 +- docker/apache-dev/debian-8/Dockerfile | 4 +- docker/apache-dev/debian-9/Dockerfile | 4 +- docker/apache-dev/ubuntu-12.04/Dockerfile | 4 +- docker/apache-dev/ubuntu-14.04/Dockerfile | 4 +- docker/apache-dev/ubuntu-15.04/Dockerfile | 4 +- docker/apache-dev/ubuntu-15.10/Dockerfile | 4 +- docker/apache-dev/ubuntu-16.04/Dockerfile | 4 +- docker/apache-dev/ubuntu-16.10/Dockerfile | 4 +- docker/apache/alpine-3/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/centos-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-8/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-9/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-12.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-14.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-15.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-15.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-16.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-16.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- 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-app/ubuntu-16.10/Dockerfile | 4 +- docker/base/alpine-3/Dockerfile | 5 +- docker/base/alpine-3/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../alpine-3/conf/provision/variables.yml | 6 ++ docker/base/centos-7/Dockerfile | 5 +- docker/base/centos-7/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../centos-7/conf/provision/variables.yml | 6 ++ docker/base/debian-7/Dockerfile | 5 +- docker/base/debian-7/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../debian-7/conf/provision/variables.yml | 6 ++ docker/base/debian-8/Dockerfile | 5 +- docker/base/debian-8/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../debian-8/conf/provision/variables.yml | 6 ++ docker/base/debian-9/Dockerfile | 5 +- docker/base/debian-9/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../debian-9/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-12.04/Dockerfile | 5 +- docker/base/ubuntu-12.04/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-12.04/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-14.04/Dockerfile | 5 +- docker/base/ubuntu-14.04/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-14.04/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-15.04/Dockerfile | 5 +- docker/base/ubuntu-15.04/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-15.04/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-15.10/Dockerfile | 5 +- docker/base/ubuntu-15.10/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-15.10/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-16.04/Dockerfile | 5 +- docker/base/ubuntu-16.04/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-16.04/conf/provision/variables.yml | 6 ++ docker/base/ubuntu-16.10/Dockerfile | 5 +- docker/base/ubuntu-16.10/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../ubuntu-16.10/conf/provision/variables.yml | 6 ++ docker/bootstrap/alpine-3/Dockerfile | 3 +- docker/bootstrap/alpine-3/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/centos-7/Dockerfile | 4 +- docker/bootstrap/centos-7/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/debian-7/Dockerfile | 17 ++-- docker/bootstrap/debian-7/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/debian-8/Dockerfile | 17 ++-- docker/bootstrap/debian-8/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/debian-9/Dockerfile | 17 ++-- docker/bootstrap/debian-9/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-12.04/Dockerfile | 11 +- docker/bootstrap/ubuntu-12.04/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-14.04/Dockerfile | 12 +-- docker/bootstrap/ubuntu-14.04/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-15.04/Dockerfile | 12 +-- docker/bootstrap/ubuntu-15.04/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-15.10/Dockerfile | 12 +-- docker/bootstrap/ubuntu-15.10/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-16.04/Dockerfile | 12 +-- docker/bootstrap/ubuntu-16.04/baselayout.tar | Bin 8813 -> 9593 bytes docker/bootstrap/ubuntu-16.10/Dockerfile | 12 +-- docker/bootstrap/ubuntu-16.10/baselayout.tar | Bin 8813 -> 9593 bytes docker/hhvm-apache/ubuntu-14.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 4 +- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 4 +- docker/hhvm/ubuntu-14.04/Dockerfile | 6 +- docker/hhvm/ubuntu-16.04/Dockerfile | 4 +- docker/mail-sandbox/latest/Dockerfile | 7 +- docker/nginx-dev/alpine-3/Dockerfile | 4 +- docker/nginx-dev/centos-7/Dockerfile | 4 +- docker/nginx-dev/debian-7/Dockerfile | 4 +- docker/nginx-dev/debian-8/Dockerfile | 4 +- docker/nginx-dev/debian-9/Dockerfile | 4 +- docker/nginx-dev/ubuntu-12.04/Dockerfile | 4 +- docker/nginx-dev/ubuntu-14.04/Dockerfile | 4 +- docker/nginx-dev/ubuntu-15.04/Dockerfile | 4 +- docker/nginx-dev/ubuntu-15.10/Dockerfile | 4 +- docker/nginx-dev/ubuntu-16.04/Dockerfile | 4 +- docker/nginx-dev/ubuntu-16.10/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 +- docker/nginx/ubuntu-16.10/Dockerfile | 4 +- .../php-apache-dev/alpine-3-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/alpine-3/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/centos-7-php56/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/centos-7-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/debian-8-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-8/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-9/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-16.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache/alpine-3-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/alpine-3/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-8-php7/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-8/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-9/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-12.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-14.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-15.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-15.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-16.04/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-16.10/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-dev/alpine-3-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/alpine-3/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-8-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-8/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-9/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-12.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-14.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-15.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-15.10/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-16.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-16.10/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/alpine-3/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-nginx-dev/centos-7-php56/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/centos-7-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-8-php7/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-8/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-9/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 4 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- 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-php7/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-nginx/ubuntu-16.10/Dockerfile | 4 +- docker/php/alpine-3-php7/Dockerfile | 4 +- docker/php/alpine-3/Dockerfile | 4 +- docker/php/centos-7-php56/Dockerfile | 5 +- docker/php/centos-7-php7/Dockerfile | 4 +- docker/php/centos-7/Dockerfile | 5 +- 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/php/ubuntu-16.10/Dockerfile | 4 +- docker/postfix/latest/Dockerfile | 4 +- docker/samson-deployment/latest/Dockerfile | 36 +++---- .../samson-deployment/latest/baselayout.tar | Bin 8813 -> 9593 bytes .../latest/conf/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../conf/provision/variables-webdevops.yml | 7 ++ .../latest/conf/provision/variables.yml | 6 ++ docker/sphinx/latest/Dockerfile | 3 +- docker/ssh/latest/Dockerfile | 3 +- docker/typo3-solr/3.1/Dockerfile | 2 + docker/typo3-solr/3.1/Dockerfile.jinja2 | 2 + docker/typo3-solr/3.1/baselayout.tar | Bin 0 -> 9593 bytes docker/typo3-solr/5.0/Dockerfile | 9 +- docker/typo3-solr/5.0/Dockerfile.jinja2 | 21 +--- docker/typo3-solr/5.0/baselayout.tar | Bin 0 -> 9593 bytes docker/typo3-solr/6.0/Dockerfile | 15 +-- docker/typo3-solr/6.0/Dockerfile.jinja2 | 16 +-- docker/typo3-solr/6.0/baselayout.tar | Bin 0 -> 9593 bytes docker/varnish/latest/Dockerfile | 3 +- docker/vsftp/latest/Dockerfile | 4 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- provisioning/base/general/bin/provision | 3 +- .../roles/webdevops-base/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/logrotate.yml | 33 ------ .../webdevops-base/tasks/bootstrap/system.yml | 17 ++++ .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../webdevops-base/tasks/build/logrotate.yml | 10 -- .../general/provision/variables-webdevops.yml | 7 ++ .../base/general/provision/variables.yml | 6 ++ .../tasks/bootstrap/php-module.blackfire.yml | 2 +- template/Dockerfile/docker.jinja2 | 4 + template/Dockerfile/images/apache-dev.jinja2 | 4 +- template/Dockerfile/images/apache.jinja2 | 28 ++++-- template/Dockerfile/images/base.jinja2 | 17 ++-- template/Dockerfile/images/baseapp.jinja2 | 16 ++- template/Dockerfile/images/bootstrap.jinja2 | 49 +++++---- template/Dockerfile/images/certbot.jinja2 | 1 + template/Dockerfile/images/hhvm.jinja2 | 9 +- template/Dockerfile/images/liquibase.jinja2 | 1 + .../Dockerfile/images/mail-sandbox.jinja2 | 7 +- template/Dockerfile/images/nginx-dev.jinja2 | 4 +- template/Dockerfile/images/nginx.jinja2 | 13 ++- template/Dockerfile/images/php5-dev.jinja2 | 16 ++- template/Dockerfile/images/php5.jinja2 | 30 ++++-- template/Dockerfile/images/php7-dev.jinja2 | 22 ++-- template/Dockerfile/images/php7.jinja2 | 19 ++-- template/Dockerfile/images/postfix.jinja2 | 4 +- .../images/samson-deployment.jinja2 | 10 +- template/Dockerfile/images/sphinx.jinja2 | 4 +- template/Dockerfile/images/ssh.jinja2 | 4 +- template/Dockerfile/images/typo3-solr.jinja2 | 54 ++++++++++ template/Dockerfile/images/varnish.jinja2 | 4 +- template/Dockerfile/images/vsftp.jinja2 | 4 +- template/Dockerfile/layout.jinja2 | 1 + template/Dockerfile/provision.jinja2 | 3 +- .../spec/shared/bootstrap/distribution.rb | 16 +-- 429 files changed, 1365 insertions(+), 1278 deletions(-) create mode 100755 baselayout/usr/local/bin/apt-add-repository create mode 100755 baselayout/usr/local/bin/apt-update create mode 100755 baselayout/usr/local/bin/docker-image-cleanup create mode 100755 baselayout/usr/local/bin/generate-dockerimage-info delete mode 100644 docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/alpine-3/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/centos-7/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/debian-7/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/debian-8/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/debian-9/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml delete mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 docker/samson-deployment/latest/conf/provision/variables-webdevops.yml create mode 100644 docker/typo3-solr/3.1/baselayout.tar create mode 100644 docker/typo3-solr/5.0/baselayout.tar create mode 100644 docker/typo3-solr/6.0/baselayout.tar delete mode 100644 provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml create mode 100644 provisioning/base/general/provision/roles/webdevops-base/tasks/build/.gitkeep delete mode 100644 provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml create mode 100644 provisioning/base/general/provision/variables-webdevops.yml create mode 100644 template/Dockerfile/images/typo3-solr.jinja2 diff --git a/baselayout/usr/local/bin/apt-add-repository b/baselayout/usr/local/bin/apt-add-repository new file mode 100755 index 000000000..5e6ba6d2f --- /dev/null +++ b/baselayout/usr/local/bin/apt-add-repository @@ -0,0 +1,8 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +apt-install software-properties-common +add-apt-repository $@ +apt-get purge -y -f software-properties-common diff --git a/baselayout/usr/local/bin/apt-install b/baselayout/usr/local/bin/apt-install index c9db1442f..ef3f327f9 100755 --- a/baselayout/usr/local/bin/apt-install +++ b/baselayout/usr/local/bin/apt-install @@ -7,12 +7,18 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true export DEBIAN_FRONTEND=noninteractive -# Update apt cache -apt-get update +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Install packages + apt-get install -y -f --no-install-recommends $* +else + # Update apt cache + apt-get update -# Install packages -apt-get install -y -f --no-install-recommends $* + # Install packages + apt-get install -y -f --no-install-recommends $* -# Clear files (reduce snapshot size) -rm -rf /var/lib/apt/lists/* -apt-get clean -y + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/baselayout/usr/local/bin/apt-update b/baselayout/usr/local/bin/apt-update new file mode 100755 index 000000000..d3019cc0c --- /dev/null +++ b/baselayout/usr/local/bin/apt-update @@ -0,0 +1,9 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +apt-get update +touch /tmp/.apt-update diff --git a/baselayout/usr/local/bin/apt-upgrade b/baselayout/usr/local/bin/apt-upgrade index c92612f02..bda7c3acf 100755 --- a/baselayout/usr/local/bin/apt-upgrade +++ b/baselayout/usr/local/bin/apt-upgrade @@ -7,12 +7,18 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true export DEBIAN_FRONTEND=noninteractive -# Update apt cache -apt-get update +if [[ -f "/tmp/.apt-update" ]]; then + echo "Detected prefetched 'apt-get update'" + # Update packages + apt-get dist-upgrade -y -f +else + # Update apt cache + apt-get update -# Install packages -apt-get dist-upgrade -y -f + # Update packages + apt-get dist-upgrade -y -f -# Clear files (reduce snapshot size) -rm -rf /var/lib/apt/lists/* -apt-get clean -y + # Clear files (reduce snapshot size) + rm -rf /var/lib/apt/lists/* + apt-get clean -y +fi diff --git a/baselayout/usr/local/bin/docker-image-cleanup b/baselayout/usr/local/bin/docker-image-cleanup new file mode 100755 index 000000000..ef3c3ca9b --- /dev/null +++ b/baselayout/usr/local/bin/docker-image-cleanup @@ -0,0 +1,35 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +LSB_FAMILY=$(cat /etc/dockerimage_distribution_family) + +case "$LSB_FAMILY" in + Debian) + rm -f /tmp/.apt-update + apt-get autoremove -y -f + apt-get clean -y + rm -rf /var/lib/apt/lists/* + ;; + + RedHat) + yum autoremove --assumeyes + yum clean all + ;; + + Alpine) + find /var/lib/apk/ -mindepth 1 -delete + ;; + + Arch) + pacman -Sc + ;; + + *) + echo "ERROR: Distribution $LSB_FAMILY not supported" + exit 1 + ;; +esac + +find /tmp/ /var/log/ -mindepth 1 -delete diff --git a/baselayout/usr/local/bin/generate-dockerimage-info b/baselayout/usr/local/bin/generate-dockerimage-info new file mode 100755 index 000000000..40472742c --- /dev/null +++ b/baselayout/usr/local/bin/generate-dockerimage-info @@ -0,0 +1,95 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +LSB_FAMILY="" + +############################# +# Distribution detection +############################# + +if [ -x "/usr/bin/apt-get" ]; then + # Debian family + LSB_FAMILY="Debian" + +elif [ -x "/bin/yum" ]; then + # RedHat family + LSB_FAMILY="RedHat" + +elif [ -x "/sbin/apk" ]; then + # Alpine family + LSB_FAMILY="Alpine" + +elif [ -f "/etc/arch-release" ]; then + # Alpine family + LSB_FAMILY="Arch" + +else + # Unknown + echo "ERROR: Distribution detection failed" + exit 1 +fi + +############################# +# Install +############################# + +case "$LSB_FAMILY" in + Debian) + apt-install lsb-release + ;; + + RedHat) + yum-install redhat-lsb-core + ;; +esac + +############################# +# Set distribution information +############################# + +echo "Detected $LSB_FAMILY" +echo "$LSB_FAMILY" > /etc/dockerimage_distribution_family +echo "$LSB_FAMILY" > /etc/dockerimage_distribution + +# Create all files +touch /etc/dockerimage_distribution_version +touch /etc/dockerimage_lsb +touch /etc/dockerimage_lsb_id +touch /etc/dockerimage_lsb_id +touch /etc/dockerimage_lsb_release +touch /etc/dockerimage_lsb_codename + +# Collect distribution specific informations +case "$LSB_FAMILY" in + Debian|RedHat) + lsb_release -i -s > /etc/dockerimage_distribution + lsb_release -r -s > /etc/dockerimage_distribution_version + lsb_release -a > /etc/dockerimage_lsb + lsb_release -i -s > /etc/dockerimage_lsb_id + lsb_release -d -s > /etc/dockerimage_lsb_id + lsb_release -r -s > /etc/dockerimage_lsb_release + lsb_release -c -s > /etc/dockerimage_lsb_codename + ;; + + Alpine) + cat /etc/alpine-release > /etc/dockerimage_distribution_version + ;; +esac + + +############################# +# Uninstall +############################# + +case "$LSB_FAMILY" in + Debian) + apt-get purge -y -f lsb-release + ;; + + RedHat) + yum erase --assumeyes redhat-lsb-core + yum autoremove --assumeyes + ;; +esac diff --git a/baselayout/usr/local/bin/generate-locales b/baselayout/usr/local/bin/generate-locales index 4be4fc424..c0fcf0330 100755 --- a/baselayout/usr/local/bin/generate-locales +++ b/baselayout/usr/local/bin/generate-locales @@ -1,16 +1,18 @@ #!/bin/bash -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions +set -o pipefail ## trace ERR through pipes +set -o errtrace ## trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value +LSB_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +LSB_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) ####################################### ## Debian ####################################### -if [[ "$(lsb_release -i -s)" == "Debian" ]]; then +if [[ "$LSB_DISTRIBUTION" == "Debian" ]]; then /usr/local/bin/apt-install locales-all fi @@ -18,8 +20,8 @@ fi ## Ubuntu ####################################### -if [[ "$(lsb_release -i -s)" == "Ubuntu" ]]; then - if [[ "$(lsb_release -r -s | cut -f 1 -d .)" -ge "16" ]]; then +if [[ "$LSB_DISTRIBUTION" == "Ubuntu" ]]; then + if [[ "$(echo $LSB_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then # Ubuntu 16.04 or later /usr/local/bin/apt-install locales-all else diff --git a/conf/provision.yml b/conf/provision.yml index 68465a9c2..cec30b1d7 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -96,6 +96,8 @@ provision: piwik: configuration: piwik/general : '*' + typo3-solr: + baselayout: on varnish: configuration: varnish/general : '*' diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index 68f7c0fec..f38b77eab 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index b58f2f8fe..c83a0827d 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index d14bbb456..0c282d7de 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 0f67ddaac..9c5eb294f 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 5d31ab98a..dce5583cb 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 517cf76d9..84ec113f9 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 0ba61658a..0616c81be 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index a0372a283..2f933bc53 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 3628c0008..bf3133eb5 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 20d4e05c3..6dc96a7fd 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 455506522..bd11775e0 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 946f1ae4e..6f77885c3 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index b00059c4c..35c3dec17 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -25,7 +25,7 @@ RUN /usr/local/bin/yum-install \ 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 \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index d64f8cf0e..dc255d0a4 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 8bdfe34e3..5049bcbc1 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 96943087c..09261748b 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index e99f5e41d..be6bb78d3 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 566642d62..d2d6f141d 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 5c903a026..999b622e2 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index f29507207..fa672a170 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 5e1ae400a..1f7aba5f6 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index b6633b428..8e25002c8 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 22be56586..8ac31c244 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -42,5 +42,5 @@ RUN /usr/local/bin/apk-install-edge shadow \ nano \ vim \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index d3823f398..d0fe76aa2 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/yum-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 81a1d9dbc..2ea2f3080 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 00796bfb1..577abd5e4 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 562c1d0d2..04af72f16 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -43,5 +43,5 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 6643262e1..ec646eab2 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 51517afa2..6bdc87279 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 8d0a88b67..8d2cbf418 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 90fc6ac7a..ea2eedcc3 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 54ef72a04..70c49b03c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 0f3b005ba..b45b98834 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -44,5 +44,5 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index a4c28357f..3b9f33992 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -19,15 +19,14 @@ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ sed \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/alpine-3/conf/bin/provision b/docker/base/alpine-3/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/alpine-3/conf/bin/provision +++ b/docker/base/alpine-3/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/alpine-3/conf/provision/variables-webdevops.yml b/docker/base/alpine-3/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/alpine-3/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/alpine-3/conf/provision/variables.yml b/docker/base/alpine-3/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/alpine-3/conf/provision/variables.yml +++ b/docker/base/alpine-3/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 7259b65e2..ea9a88438 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -20,15 +20,14 @@ RUN chmod +x /opt/docker/bin/* \ cronie \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ net-tools \ gnupg2 \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/centos-7/conf/bin/provision b/docker/base/centos-7/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/centos-7/conf/bin/provision +++ b/docker/base/centos-7/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/centos-7/conf/provision/variables-webdevops.yml b/docker/base/centos-7/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/centos-7/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/centos-7/conf/provision/variables.yml b/docker/base/centos-7/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/centos-7/conf/provision/variables.yml +++ b/docker/base/centos-7/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index f064df54a..dfdcd4a6b 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-7/conf/bin/provision b/docker/base/debian-7/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-7/conf/bin/provision +++ b/docker/base/debian-7/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-7/conf/provision/variables-webdevops.yml b/docker/base/debian-7/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-7/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-7/conf/provision/variables.yml b/docker/base/debian-7/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-7/conf/provision/variables.yml +++ b/docker/base/debian-7/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 9249ec988..2b5fff13f 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-8/conf/bin/provision b/docker/base/debian-8/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-8/conf/bin/provision +++ b/docker/base/debian-8/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-8/conf/provision/variables-webdevops.yml b/docker/base/debian-8/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-8/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-8/conf/provision/variables.yml b/docker/base/debian-8/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-8/conf/provision/variables.yml +++ b/docker/base/debian-8/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 92592773b..60ef8fb41 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-9/conf/bin/provision b/docker/base/debian-9/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/debian-9/conf/bin/provision +++ b/docker/base/debian-9/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/debian-9/conf/provision/variables-webdevops.yml b/docker/base/debian-9/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/debian-9/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/debian-9/conf/provision/variables.yml b/docker/base/debian-9/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/debian-9/conf/provision/variables.yml +++ b/docker/base/debian-9/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 87a7bda21..047b345c1 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-12.04/conf/bin/provision b/docker/base/ubuntu-12.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-12.04/conf/bin/provision +++ b/docker/base/ubuntu-12.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-12.04/conf/provision/variables.yml b/docker/base/ubuntu-12.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-12.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-12.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 2f116aaef..5a9a7f185 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-14.04/conf/bin/provision b/docker/base/ubuntu-14.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-14.04/conf/bin/provision +++ b/docker/base/ubuntu-14.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-14.04/conf/provision/variables.yml b/docker/base/ubuntu-14.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-14.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-14.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 4f2bc9d4e..b033bea58 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.04/conf/bin/provision b/docker/base/ubuntu-15.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-15.04/conf/bin/provision +++ b/docker/base/ubuntu-15.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.04/conf/provision/variables.yml b/docker/base/ubuntu-15.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-15.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index db758edc7..cbda949c0 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.10/conf/bin/provision b/docker/base/ubuntu-15.10/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-15.10/conf/bin/provision +++ b/docker/base/ubuntu-15.10/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-15.10/conf/provision/variables.yml b/docker/base/ubuntu-15.10/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-15.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.10/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 4e9ac241d..53eee2dbe 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.04/conf/bin/provision b/docker/base/ubuntu-16.04/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-16.04/conf/bin/provision +++ b/docker/base/ubuntu-16.04/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.04/conf/provision/variables.yml b/docker/base/ubuntu-16.04/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-16.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.04/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 3ac259f01..bfa7158cf 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -28,8 +27,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.10/conf/bin/provision b/docker/base/ubuntu-16.10/conf/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/docker/base/ubuntu-16.10/conf/bin/provision +++ b/docker/base/ubuntu-16.10/conf/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/base/ubuntu-16.10/conf/provision/variables.yml b/docker/base/ubuntu-16.10/conf/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/docker/base/ubuntu-16.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.10/conf/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 9ef3433c3..5377c10bc 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -28,6 +28,7 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apk-install \ python \ @@ -64,4 +65,4 @@ RUN set -x \ && apk del .gosu-deps \ # Cleanup && apk del python-dev \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 zcmV-zB9h%gT4*^jL0KkKSy*ijEC3x4f4Tkq0APRr|NsC0|NsC0|No!>1OgBM0RR9P zU@6{x@CnPCb-V!{=YU?uf=YVM>vqM#?^5@jdEMiE?~d3#qkvDkUw!x1L+GJ=+~)4x zWxL+z(V_LQdPxxLM=qUE&@GBp3R?!6pwyC-gH1@#wi+50Di5$q5i&*r5jUx(PgKfg z(w>@+MpMWdH6Ev_ra)*kWO|;HBWfO|fCi=!kRw2aG}Bamsp@)adY-4KJxv2Z8VwB% z0MH&&^rJuk2#jipsi%`j0002c28{-Q02%-Q003n51gE5sL83AsBT)4{G-{7&O{ub; zlhk4|G(4aI>L02aJws_U0AUn@OhZ5j6!kwzrY4Y2Q`1w_%$g>HC#c@38gIFqh$>?qfb%lGH+Bg03M@5Ko6W2|DV!+!U%}w4$z%J zU}F|OwgMDy1&BZgL;}ZI+{M;iKDixpvyD_1=rRagD*;@HU{jL1j{D!nU1H%Yfh-Kr z#5Bf6RD_@qB~VjT1&D!El!9GAXb1=-1_MA9T#5<=q(r8W6i`|bQBfKYMw+S-RjO1K zp=nTRsT61$6Q4m_DfI(GSQ78qa0UvX;^q5mnYKA_y0t038nihl3ZjETfqTL&BDzI*3 zCCgJe?A;nEGyaUj#U*|0rlz6@RGSVzgxG*LTJvtH*Wvz&Ecy7Kj*vc7s4HJ-__~}9 zOHuldi-kd|$zexk6e%iSpVHK@;DN1%+qT(ZY^rkPKE z>6(LCRa-dht+%A*mLqDqoe-tMENykB=A(JyH^_W^7HnX0k;tl0f)JqqgtesOu6V8~ zbdzG2?x#F&j`0nXosVsS8E47HVeqosW-ct#+M8{**tWzrN3mYZ=X86t${G@yPu@*8 z(W%1YlWDngmq_n@W5!jnS7y&6)%T}0zdeZaKB()LR~OQo@iS0r9ksNklD(smaUTpy z){gFho#($!^zyb&mg}!XmRS((JX-}fwpTtX&wizcCfl!;S#94$T*kAFax0VinWodD z#J8hJ;$7~!hlv=`Q1ZMA&huqjk!)>T z{>5*kjX1sdEf_oPeEb+#03=^k+d%Giar~Bd+-vp8EWUa4lj~Cfa6xJJvm<3mz_$7b z5ENH~SI6OMUt#9~{VapKhmY<)Loe0RPv?Cp0^bm}CQtS%sw%3gs;a7~65SezWg+ZL zoMKw08v70$q>?O>NnXWBs=3JGN>x_mMO9T%R^(MxRaI40Ze7Zf3nW#NNdie}xp9jW ztrZrdO1B_--JQvXyzP8nl3}l*qp?$Dj6)5lJCt#fNVKArvPR^#XTJW^M+7rhG*wX5 zjudg#+ z$YUIrdwvZHaN=AY+EX7!?I^$l9FfP9eJ%<3(9-`DLP{gXPyr#3?d1s}BqWMS2_YmT zgpiUFLP$voAtWS(p65?SiKTJZMCmbe(c#8my=-W(Ws+q{=$8UP|&ox!n8tseG ziS118CQ?>+r3wVZ5glu;J9nX62(gBXPCb|{JXq&^ud&j@ECspFARuYyAoJ)0g* zd1bbFm_2z#dC8Ub$9JdN?$=fMYKjC$-|UkRI!KsY1V}Ig*A|DP|nZ zs`c&V*&_8^^G^hZ=@F}uRnM0I<-4D_DAQabV8(&8fiZOV$)u7!OPPk%bDuwR$6-sxM^!eZj?{j>h9-TrFM6}f zq>=zy0AO*eARF)FijSCc&VnnxsEyb`5HYurCEdsG2sZ5Qy6#xw+j=Di>9mu1)mhTw zl0r+Z_%Vp8h@_eO{)!IWb$DYyT>f3f`DB11A`ugIK@f|fo>rGrBNGpr<~*jO8x_$c z_ibOjPGS#7#%=b2?XQwcUZ&gY;f9r~I!7sst%mQiVYl@@y_n_2C!h~LfiU^)2OQ|1SOXOhtQ2`M?Ri8xl$og~z*GgiZ0xr!Y zFvc)uQ`P`v_o!dg;(N}!GCl5cVDGua&AgcU_lR|ncU8W#r1oUGRjS$Jsdkq@xODcJlELSL-NT?$FutCw;A|*$!L6;iE z-2*vYDz;p&ijA8qoT}xBx?XhYQHc6?<&@i5vW<;htzU0J@@;He^Hb~XQ{U`kn4DFX z1F>4tIfN%v)a~UFGXiR;GtTAm)|F0pSquQgfFwyI5d>D0CQ$)FMDAD9)pHa2 zWgj8xf}|>ROK0jSEnx#Xy`jZ^Vn{65nv`9?-&w-=E~5_RBT`D!Fzihsq^TpDNxQr6 zN7+tAq7UTm~}lWlAqT2ad>YnTt4ei5@1jx%(_XSZ?!bO zFmv%kzl2<4Z82EA3*+JKr@Y0gqn1={SBN=Qj^&S(g;_ohy}hDxBdr2D*5C3QRTZL$bJFXu4l zD8fz9rl*wxzbMDH@V2XVE!Tl6fk~T|r zGzCt|qA3^*+o*}ndix(}jJ=6vx8(X%%65vwfAe_fA=2Hmj-83S1(_*II6BH=ZMY zGZ@XHv^ktY#Ri0e=M^=H?F40EdbY1WZ5oebyT!@;W5j(%P)`<2XJl)Q|{^1X(SQIeU z>zTG0DF|t;BR9~en4I;IYcf*1fV*N}TJ}_I#pekSpbdhdLP$aZv@YU*@vbdg|LI10 zefjRv;pz$1>bR!sYUs2LLRBVU7BUJ%1;3iV4v-c}7UAc-sB6dJ{2!ID?t61Vd0HW` zgS)K>v8a;NoixzUpZeGcv(x3@T=BD$TTeJnh)@9dhkq(;{n%rDWw|$HP+&r5E~E>vC;^~=UA?- zi43*ayj~^-w2p5JpuA_0lfIB${AmCfG`tuP)(rr(5kgR+yWtAI3ggSt}8k(d{@%5-trurK0RibbeFD3WnN#B61aSIP6E8m1f6e> zSU`dio)f#!e!Dg6`hr!mee6z;4Zv{V&V~vV4(IoP$|NE6F`_gy&>8LT@#}E&9tu%a z6;`DcBCF;2zH{&JpvsEi|F33eo7L`l^~a3g`xW;$4m$m#Hw#;E#5m(|$gUsQb3LCU zcv=qJ5eQ4K@L-wY9jNKF^q|~sd7CqqbB~Z!Qvt^vHc3KMG9zm$ZHplRF`OQCtpq}< zoMS05!l)Gt10lab`+I;0Kz;%R$QW<|^mwn^%Y{mnWb-Vw&|a(xhrm}2NFWJ-oMjHm z6a<|O=C(xz^C1RM7?!5GF(Rem0XV2Fz5!GY1Ep+piQ$AKij+}dxSSyehOB@>3Kz}@ zX+5Vua`968g2txT?IMaa=JAY5h-E?7Q%zN5vT9P1QlN8FHi?k~wVRoy7++e|<1q0u z$|uxaDowA3$TtP%xC4tRJOE~N62o#!cjB=Epo5G+4WMsTm-fgN1EW++-9r>(n1KNK zb;uW&;g7O`3=;WA;DpiS!*V)pS!?epuGVLL*G(>qrB<~mb*#&-x^d+pu~cuN2g?E+ zU=oifRCexe#M>8Q$4PS|DM^%AN4TPrpV$5t&%&%=d%nR4c3!5AAxp+AaV&|O6 z#ol>bnjNnauw)Qo%CQ@F?cI+d){<5gD}8NiRobJh$yijZT#oh=;J||B8G8oC$Pl0@ z(E5no#wbvVQ?0H_t)5K~C0w{jm5r-?yK9E1)i}T!HIoXvt2)oEepgXpjq`ym6v6<- zmo#SSmDt|~4j|A;)9| zn$53IsrpCvk&?1j5Nif2zyvX8kgr}qAZe?`OyH~vk;ir%ceW@E3!>-gu^7HpI1XL< zPBL>+M{tWqMWKgfbvO?K7@DVIUOQ_MtU!Q(zMWOn7jp`1aS>3&1{ih@ez#yV!$bvG zgE+=8tOZ8|FdrP(Eb<0&NlHn*WhqJB!JLv(k}m>?q zM{6BkKqG;gO#LT@&&p3!%4}X`u1o$b_eaY{z^?hLY0v$ zO2djoUPl5Io_L-TpA+2MDE3S|nTozBVeR9HqJpF5@bPnRKTv!@nBhN=a0lTi9OF>z zK9Yelme%Rd&Z?@2h=_=)s;HjO2m=A(0%Bk|fkcbi{!FSxjAI5_X(WV_N%B@f?$^!2 z1d%MGZB?osv)TA~l1*|e(RaH|~w4H_rUIu0WL_`1p5CZ@q zA|e;hqx+nAXP#NP=bm{J)~c$w4Yxkc@wsvm?!}F^`VLxsU2kb7F>+$@B*r%ez;h1$ z4zPrl90Q@Sa1A#qs;;}$S50~5{4;lMx8l^Qkr6~F zA3$ejC;#`%E+#Q7FdiP&=_1bZ%M63GsCg>GncKN{h2eR~t0eFO72^%(w2sGlxHLL} zd^P2FcYyELmEB$4oV8w3ET<(^a(>j}YJ=w>Hs`ULH3GcxYfYRaXUXIGD>4ER!(q&vI{`EEuvbbv`hQGsk-tJ8v?{8oCl`#NJli6ppI*@Q*hYE*xN~z zFiBk3v`c~fOw`)Ff}fQxc^XULCh&Z_Ch)f zj$*;5Co&RYU<(YgXW){MB;ZgzkMYbi4hep~N0G?~*|eLME-+|nHS=efx(cL~L1qv- zC1Mn2cm9VVEhi9I&kxlakg-9SN*)JIK!fDMkb8GiW#hCOV1k1Rn1v)=UiJXQ@1@Zq zDt7x;A)KrRwK;6awJJ3oV(HAemcc;y474{nBHKDWNiS$GL!W)P(Z<$L4k+{_(;`ru@zQ3grCbK%Nb~SPWbZPxvaed(AshY z(ndSA8#u={TNI>rf)U*Dn1pi`M-YEMMWJ*FtVpsEyc8GS4f_f;C7nbT0?k|_)7uTD z$TqrKA`0`-{7rIaE*wKkGL#gAg~Lj)pwIm6c5M^Jp$im&izE9_5C$e|G6*!<5|+~SwTDxJ zF*z4|hZ#~`eUqc0HzgoR0LtNY-jsbB4!Kocna@k2nIYCpv&yO(V>UsCA8ag=R>2z$F)`<# z!(8Sm7y+3>5Vg_TLJkfDN>VGv$q_bFCs_28Ra3~$R;&P<2mwITgc8n^v_?{U#`0hi zsHzV$BJ6Q-libN>q$`i*%t;haMSxTsOE|GM@WB&<*5@Ybwc5}P}R!r zq~k~=hN{V16{a$<$E~PC5mPwI>?rOMqRbZ2Gr5h6X_!}2bORzw&1N*s3}{)L(jR&T zYEXpz^E@UrP+sKi>GQ!K^oe@pa2vwlTXk*UUmCgFa=8U8ue`f=aA1UiF5Z~}`NUIr zY#eAniZ38$fW!wb{o0@k27c^Ew_E<@#U;Db!BiJq#aw;JXftTN2d3wax3o~{BWMQbZwVnA4dN{cQGswH zKwCzYEEpZ_CYafAJ$&2xvdrF;X+V;LBPI&8;&am(E)=&YffO7vgCUfRfe84XTMc8U zzIWl7xJphN0VS(oINczCvZ#Ar=Li_<}@S5A*C2#V*_0UG~Ei9=^3B$gqOR z^1#Sh0kG%xc*G&`deGJ^NJx=_5Df(wD#N6NF$uW{fK;KcWOxV=6#EZ|P`v|UP{ANe zWSyr8N~ zL*@qM^v^?n0Cl|5NDmYn>L!mkK@gm@D26oq0uu-vM@U-Y>$7bcTrj6x0?8&27HSew z1)5GlNzM1YuBz9M^1P_fyN>eYx0hQn5Y^Hh+HQunG+tUV#0oLH_u8%qyqcI?TgpqPUjh0?;MV9RbtT zDNb0#svqi-X9yKMGee>AK11SiDrygOc>9TG)M2Qx;Ddr(^+Yzql43|H>!BVxz%V&K zr&1E2X%GxoFlVuF5Tn4^aEJuAX*E7I;NekSW6$r1Jss$&l5y2NA) z7J)VmfHo$cA`iSQAo~VTJOmpqbGJw{39tZ8lk#qTnwPbsLAyL4KAQy^U z-N+|^6*V24vg!wr6iE8X4XeY&uOq6>hm|!UlD(`7%EYkb9ifynok5r_Lk@lMqTY89 znji`U7O)=N4mJ=Hymir|k8KA#z~B%@s^J7&n&gow5;6mja}^E2A(>HOiyOQ)1?Yf0 z^Y>~;pc0_gKypIJJCHnDP!d8!!~TMtl0v2^OdAWTwI1phtDRUkTQY?X zmSe6>CPw|6jC4q5TB&OqJwRTv!@*tBT8X}Q%AOyYs65&+79vB1E^#3;YU8N1N)T?CN|18|(Cj^7C5r&; zFjr!rz!Cd0ONs^?0JexGRmBq2u#*y!AQ+KQx?s+;6H+^_6s+SALF~&L z3q2SG58(TXhXcS4{v`~V0)#K8j3oq-Y_M6F^PD7yOg^zTPcU$hHmBv(3(0^=063OJ zyk-e_^ZqD9Lb`5t7<)!EEOA*|xl~}%Ma6eDDh_@R*W=ij_&KyvV6ZwQzOsTUUJ^C% zz-&2i5S+u7a86Ord?8|d6~f%9-f&HvnTND*>Ov{#f>3C3$4MHXf()goUgQaZPT!J_ zN`earJXb-95)cJ-wa{wnBP+(Tyw&)SzFePA8W<&t4B*H?1Ol{FM*t2i0FIbLB||dW zEKD<_fX!PmCRLWitU{lc=dB$Jn9_klTUvnUrUX!mTm-`c0ul}&jY|b1P?D$?lzNGS z0^owoY(2DXw$*&$ecJ7JcVLKCMI~sC@&*JTXg~}BhVl@LA3z$R3E}S51w&!R1V~t7 z9Xq4>XrZdLQE#Cl2|2TTXpdi|d%1?9>MCq^&noFQZuJ_cZMyPz?&K!98k@J5wGiP# z^ySU597cu6l?*)wGGJ-58i+T11PZx*wBrE3P&_b*<_{)B%eq1H3(_r|n#D9L!thYu zK>``UGr+%$0vATPX{-bh2#^szvkIcDQ2hD~k3SI3Wa=p{Y3%p9+sk12<9g*IC4)YZMGCz3|1ym{xv4jM|C zZoJUjx)?nMrgR&fe~grVZ-YL0g=h>4sDznOq7r4vQ6!0!HpN5X!UJ1$Gz=0paV#9c zhj_%g1_TKmKBm@TA+Q)!U>e2&-L1Z7=_qtQZ%}GED~lk`1R9vAZrEVKpw$GAw8C7u zF6!*cin~lkvT(SkBnLAY5cG7Qoo%UR6_SQc{N7AQ$b5{vxiTR%FhC(mjmtNys#RW( z^s!++osGcN7Zgt-yaM4Vn*7H- z8VM)}y`(3b(}z4YAz`3>LJeLmn39V6O44{Wgu?lZr$_+9&MQYDp+Hi9^o*15;skz{ z+7s2{?+ULkVMi1kJx7gp@Hp5L~e!VO2=>pvxjquwpg%t0(}) zVlp72p^-q-TnH}%0fl5QIh72k(F@aLGR1|mG0p*IOreU14jpa{WT6|2PcW>8!&(mm zr(mQAd`w{E4uar1f&@uNN>A4Z3|+z~L6+_=Kq} zXk3EGy$i_#IHDK|gZ27g+dg<3xY$`0rkTF-qLZ|}OqSjgi=|TihRtP{UlzhB8$t5V~ zmku4J1+0SMg8g35p>SMf96=JGW~6cnzd0$QhzQR%15CElF^mqO+NG+#gTTBq?&0SA j^6?pehbyRz_TQ>w3Y!(AiLlj~B&bku$VrGy1OS*o zBMLnk6U1mp^o&EwW{CY$(t3KHsp$_;XlQy30x|*r;>S3NwqNm13)wy000Km z^ns87H8T}8G}ScqJwc{`41fRt01qh8XaE2PfB*?kNf3m@1Za&KYM#W&GBl6TPf*dL zKzf=D0j8O#^*uqL00Jn40%WP_qMn|UMEywrLQ~p_wLKc1rqVqK4^YwSG}?xNw3vVz z8Ze1M1ZV&d5s*y`lT;o@5O4I3i>_tV<4MLR=fCa8Hv5rzp6r*f= zidL85e3xmIG~aeNh(OY?2oa1Ff@Y9d!W5KY6(AH;2%uDi0SGW*R)YZw1W<(nP$B@j zgb;%SN@)Q_1)&uc5upTWs-YEHr9oO2l?+O%f{g=0t4fV1h@g!MA`4W|2r8>eB>=Rb zBkJn)ou7;ApVwF6(;v;X9>Hl8X!$6raFf@Ig)Nlb8l`2(#wx$hAf+udC|gmbtn#SS zj2T%d!E!i@G>-;T&w*X^4`c%XMSbQ(S^}WECo)LLZ(_8{X?RrEY*x$)U2ny%<1msC z#+qV&_ddVNr=~^u#qE_NL28g>J>wSEfYP*KBK7w64RtWWXk*;WrC>C1e0R5BC5q>^ ze;PSZ-b6Z14Jo^bL>7mcbg&#iLQ08&0hqnh2A$ROAA(|2YA%6fDc|GCZgepbY*l2^ z@|yJ_37>r5Q-#vEiuxz$Wl_CSX9f~%J)X-ELJX0e@3&EbW#^|me>Kh8dts=%TsXkW z*A*#G%)@%ME>#AJ)Qod3!4oKYrV*Oel5{(P01ryb;zsanLPiO7HruaKg|Q`eA1CSr zI}0ePC>;bMf(e=^A@O^Je-;0Rnul@`1Ql3MvAo^_34joNg5?Wu=mM((_L%0WSo}di zl2`fqIm`18V!zL(LTJ%1Nj655DBoO3Ps(ml7e3iVY}x43?2yw;t!7l{C;;)GDiIL( z)59pdD?}?lnEjTj|6ZBuw-Wc*c461s*X@_Lx3jh#f#{yUw~_Imf&Rq2CyV`QC*KRxLNoh* z*`fZ~=U+#jxu+jR5rQ=A&!o3!-_DcHvb~{_s&nM6E8(lf7;&bu#z(KI=;#MT(r05L zQxz~2+SR1EX|1)c7H_R_=&wC^>(pa)=XBq2XnJ%&&_=C2_jBcUruE-__tyKE-D2m9 zx1|dhdKqkNi%;geaoOw1wdj4gpE>l)jyOw}ZF9Eorc;D*uQta$%`{HAaL->XZC*U6 zj1h!C3(ku?URgd;@ksA^afJ^NPCY$T&GQR>^}1Gh$&U(aeNK^l;W=639c*0>zk8!O z-?3G+94RYg@Nw=t(dk%`@vF@weO;@G;%n2b1sHF4J9O)V-D|~@hrp&=MZP_$HkZpf zIHhtf2{#894elL5K?DL_);Ea+IB$b?$5d8Ufh*TrYfW$yc0HSYTYR7CyW{o!^F>Y4 zL8M=Ee4CoIJ=?tCo`EgFI$24C!GiMh{=6a>pAK>TCq9FsXk z(DI;&C_Cm)rzI}{076Y50~3JV^k?EXqXAar<zW&ok1T%9Lbc&|A&1QGcj5x?Yj+Qh$tFITr=;%Vvqqk`h8lq>z#l zLP$voAtWS(kdhKYNJ;1G_w`L{qis{JW8^wBk3W7rc{~~u9)4QmDygK7oOyb$Z8TL~ zp|>nvtWPA;;$}+H=x}fhsug7!v+ZV%VJvQynM)hs3N^<}VuH0)-&Idchg^i~yQ{mp zxe0e-mv?=kRng)&^E`>>HQ9dsR^U4_Wc6tYBAjF-gp#Kly1TnBLS5LZT!fI4RJ*d| zQb>BFd%GyEb<--cYosKEkdhKbB!rNgUDe1*2_YmTgpiUFLP$voAtz1M;}%`olB%y> zzN!KR2h*^t#qJKFn8og@4)P8w+TKpV%1JcT8Nez6h>Ous*2KUPFo0bysBnS|4B*+(;v2#68Wp^&S80K8Ur;n$zrsuvcV+lYt?AF@o-DDa#_!t*NAfw)6Y%)X}_|1D_wd(>B>{-mG{YU)oWiHXf$D!v<_TE`$W=q&)JcGR{NomR4$fh zP$A;_EEPB@YVT)@XO4TXV{n~y(4OiijyJIfjTO{*J2kNG?)2ve%{O!2XC2*lYoSF* zBD@PVxOc$@%JM=OW|c`1V9fGZTFQtOR4TMCgBNh_hGu3A8H7rDo{<9Dkan)X z`T4cT&qj&@voaz_L1sk8t5pxn27*9*QBlCI7Fb}c8wIDl>j580%D4UjeQxtW*{(@D zymHlb(CbchrWfVE?5!l93E3P^rc^0UY6rC)cUnRakEJv5J6?_VTz#x(rL8A|I?9}E zQxth4O7b+l#XeUU-$I_+)RIP-<;L8oxbcL~G}XU#wzssmT--V|CK=jfSdrhGmYne|yLFd#n3L$#wdPpcO*O z@q^D?MFP7m-$&kX;PPvp%%bofT3v9FO{>DE)`to?0C7SHOwS>qz#t8S@W`o=Am79* zBSjZh7eNB*)Xa#<0GU4Hj*Ew@!x)c&C(su9Hmdq?I!-R-zM6jyihR7c=NEz`UK;CG zMo>lMIr?@2`2*(yhIRsd?QIB&|nOp1qnn29ODI;pcE8OhJufy(1TU=-QC1u zG(?wWsFU%Rg$x)dtkTdef7rj?fR;qLuq^~+6Ec{j=QM-Zk*Fv=C_$tIO8d(yfQemV z6+XlXLO;d|3!PvqQVAg-LIOwu7y}pp#v(Exk|G3xjEXWLVz?h~UW<{(C*Oq%&gfkL zwLBpAs}T!`c|At$45xR-5#`ewZh0Zlc6jGRv;`u|=Je8tVD0TY0CXm(uaX(ikh|6o zAl@&&#at-Tt2~6QlY|Z9$6)=v7 zWJNB#Ag9qec~gRm7|+$iUZQ!{19`&2=V`){F$oVR%?daDB2amR*pK0R-XXtME9+z} zB4wRJU|9x4GBVn|UI!OhP8d3c^$Nh)QmC8a+Gu(iZ&z5C#+!{LZRv8g{`}+0Wx&4d zzWeM80ALfm9YU}h&9MnXPo9I7kj#3gbVEXDSLq8PYAq;#UqI4wqD+at>0w5sc@=3*h#et zri5qmeCVm{Pdolkr(Dys_)!=n?60J5&%fwN=UHCR$yGV>R+aG8;*2=cS!0%iT^>zT zqDVB9Y-%u)WN9W+YS_FqMwCmUc6=+EkG^bG->+H=n-%4{;EI`soc83LFw?Z5=neEE z$10t$@0E$%LP-jiOfq!17Yedw)1v?9$*K5pKT{;Rwd38co!#Btx9%~)V&{vqquy|O z8zRDK-6-hB^Unj9zHM!!w!N)gUl>gzYTt&&nNJjLj~6@ZUHH)$BSY@ZqWH_-G$<1*?5+Yw%F<&I5!5(^CSGIIu%Gt8t@q zj)=GCrLkj$Hvc78$;BvNgdu=HzUPC!3N(Fx$?;6izB?Ml-sb4V6nc;fJ-^^|pC{G% zJ|9-W)9HKN?!c$aAp#Fw`=@ttVQk7V>C)-n{zIQ)UBE6cEs>%DLPIXerPyLPd$);p z9zc>50w5ZdC`uqiBiSkP@0+ciKeso3e(l%lGf>z%9>-hz zuEkBnUF%3Lu*5X>I@grLG0ZiV%N7wawzI*emE+@OaKn9~RSGI?LNA zX1%Y_gsvZ-RNxMvfDI@>e;4f91Q-z-A47jJ{rk3U`-u@kExpZsq2}Zl+Q+m3k4Cbd zAA|^$nI!(PFp~)kAYq3ui;e@g7I{w%D5{F9Qi_pP(?{F(e)0FZ2oNCNPbH5UcsI7? z1WP6yq2HMEhYi~J#*U@808sxtGK^3{-jV=vSe8vcv9xT>cLtjVbaRh@>DF0G=i1>ak%nNGDYbuRW(mg~I-{A%GBF z(Z&i~ViXGKXkW^J+=nt2y7RRw(<(K(((2jhWUen9Du7tAz~B%loAhzfqx?GVWBVfr z$ocS@$zGI+N=H>gsPEYqc4@TUwXB%xAu%SoicXG&yTsRVh9tDO(Jrj2TwHm zoC2T(@UJli2-1LDMr%y<=nk##L81<<=;~6GgFNP8-POB73<4oi1_Ab<2rhsLN0YH0 zJoAYw;avcTJ zNtYLTX64}P*s9PM0V4bd0)q~d4vzjvhKO@S?>j89#f(EFIik$gk8KO`AVX9*c|{aG z!JvF#;0nkHm5|fMdI{U%-FY%h=Q?dwl{Yj%N~EGz;-HFSV%~k3LnbnANC3f=j0qdb zbOXv?jo7JOuW@Y{-2mR2v}o&_vAy+W@+h-*170A&r6?NU4K61(R1bMV$FbaQ_4r-o zv&+xGj9oqF(>p1v$oh>57Ls;h(qgFwCD-X8h05wIR zmF}X(1@UmWGc|~dN^x2>WE92$u^rE?q(fW{K!F4}&=3+bG7_Q0-FONx0$p|PAMNnf z+HTcU+>r!So9yG&*PLjoM2!ndq|(OdS!7_XRSXChR7D1|TpEK+gjx3}FG5D8TEF zs6Y^}J4wz-B1t5al0@SGflxBQv|0t>NO2hcbxI*5gL=s!B$9m9ko4El!UT~lqmIg} z1M+R~J#!XD<=?W7t_rI16j8`-DGo(IymfW*NhK;ER}Ko==4G}?Ew{+d7RKpI9jf+cYfw~J;bz8YIhmY;0rQ5I zVt@B^!s25R!vWvay>cw>EU?IR6%T5xIh|XVcwQHrin31tAzm=vc@g4w8-r7@3*omb zySxW>+^*{G?B%lZk!3kmUO}K2qKc=>^N&Y|R!r|j*g2Gj1BfBtTzYQnUmLEv>s<0I z1;gBIBMG25hw^74X$(Wp0PYP;2NhLtR`a07aU#hy4&65<`QL*UY-r4YcmWt4p+LA9 zeX)jVT8_!WA|*Cp%@G>nZMQ}ii+{O#x(N60V;6%r6U1Hg6k*-BHfczT6S#pb~X{nb z9FBgQY9Y9}D5?ukgSwZaW~T}G>Q*(3h)Pks&n{HMS~?NTER#XkSfTELY971R+jr#C z3N+cF8Vn1~A!?6lj6jPqwiL#~*7M!zf*XtAZb!=fOL1?`VlxU8_sa#V(!N0hsE0kP zz)d27{3h%!JCk(F50A2o?hPpW_2Zgqikc!s?by&7!>HDXQ6wK;=(zE2z&M5h?KJT& z;cGy`=TL^^D;;p50)^=4GXUd6Fot+c3R?FAz+Fu~nXtsd<7c?H8v0l`r&l_MxZHV# zP$+53fzQ2mYQ0NOa720`-eIOF8w=1e59R%t28bsSCGi~~pugJ>XCMnV4@&O^1&N0q z%0E}YI2sUfcs4;5_*v6>8i%26##N~gb)A|vz^3|u(sEc;sJN9k@1>CbvK98_lHbQf zAqpv==k;pXfPLRPR7lVzi__zk-qzNSkVRlOJHBb4b1u?h^ z;e9?c380~T4ivRk9)Sah-mYl;wuU+cA)1CG2SFHSw~Fof0)pG3SXu&t?KKVtgGAs7 zf(C%aFHJdx^8H)ADq}ndMaG_u_w0%m-K9p?UlUo)Vrg7MZ!PYQu^naqU3Cp~q8YLs9)t;}IuTAJ3f2i0+F=7;W)fx;7zP;JR!~5w-wg^ZKnJM}MrvRrbxrKc1JjBf>_Dpkfml6AmhiN!hG!U- zCg3fVm|-?Otye(oAR_nNpp zd$CgU43W~sHt*0UI35+seIknwvQ6SK0Xu(#TPOY(>q{^6dkfQ?=0Ff~|0TaA^o6V%R)m~X@I15vr;RM&X zctVw}K%l^8FckWe)5K&5y5dte{0hr>$7YZqp0dNBFbLpN^f`G?)@P-UTgYzgYU??u= zSo=WS@QKQn9bpo;JfAAlR74b3sa3Xtu4Ez!RuWOi9YANGx#B>kO#@-d{egjUE{&$m z<9(ZuvjSdjQ3bw|3V7C)u|VVR3xdZmhcNOD1E@8n1HX2X;H*U27T95ADgn*M7~rrA zwIF6)(uKjk(>U46$m&VAjQM&znf2rQ0{~jg8MC^DNF9Qqn5|P58;9K-W3yTL59Uvan zIh=?>D1znJzqmY%!x8y#lUZ?)ePQ+n{gImy(l03&e8_A86H$r>>1q?&AGjWtqm_MY zwA>s+Hq668)PoQy!Z;AeH$0@$bQZ{bwU)60cLN=XBo5VRBt@6=Pxb<`7L27{dYyNW4b*GdE&phMd6L@DBHH)}FoqaB=di7wqs zPR(+#v6Ll}U}%Xk!jjwqhmdC>b%d=bBfCTs-tE2R|&_h)NHX&;}s41cd`BIIg1i=CGUXuiC#7m8bgsd>IcmZWT zMMHbzfw1pp7h1GNyo&(S|2Gimj0~Iy;`zGrmW9r~0=n@6N3z!~M4C)jJ zJ)Q6j_X)DLAz*_DwUi?XDr~D!3W{k1m~@(KLY+3t;at~ zaq^T+T@xgASnr!0?iUEIaCuUtP51_8A{;GS0)p<1(9H^A@aATrPWnciW=2GTqTZJy z3U9k^xUqnLpuHbThLP${Mkk`oql^gBg$Tg*O30nX=Cc${2Wh+0kFg5@X6gkEWiwnr zk`f3=B!PL5y2}Nmx@xmRqaa1zOj?HsUIp+d?T(oUnn|R5Kp_|xxzLa6sASDa|F+NpL%*W5Jg4w0f~Fx{VJVH-LhNDOWD8Iu_!J#T9=*T$B+5 zQ#h)v2}sbq9rcZAEgEPEpTdO(v}ZI1$BU$vm4dy|1DKWe4gml#`*KeS4d8`jK=7jn zR+5PW@&&RUjSrMf z1EB^*GH^$2izsJX#knpa(xFSC=9NeM2iPSvzz*^tb;mZQfKSt!9T9=N3-zN~xE2mj zV!$dbs6b^4gDQh7brtgFiQ7P>^_;%DS|U>JAd#gJq!KUP5#h5Qi8LL+0%zh-Xd0?Y zhamGj&7tC484%oKs4)>0frT3)LGwf2M7STJh+tnF!}wn>Dx1u>vJjJ4{UMQ2)2&*D zzWd@*DSQb5I&?;WzPr?@@mRRI9EGkxhk^|5F@lE$XO<1{3zpMSQSS(SDU%p_Knowg z_m>AF#0@7tMaFPQ$Oon8%E>}+v8F&&G~Rinj}$$^jJ%=PgNpucAcuy)qyX+&LVhz^ zXkTB^5vuM$;gi7E{ewz3xZieOY+U#o(qhVnfa0pXMhY@) z7BnB7^1$vq_6Sy?=U7&g-KHUWe{$`Z>qGD)4T;akX!^e2s7Y_x3PW?Md`ZF(g^bKZ z(B>6F?|<-FSP3RrZYmY(@Lue-0A^HFy8@JPbP(`AM z1jaCeqBtHENm`-AE2#TWN6NkQ8aRSNdKxj1!5_K>NR(M{X^3fqJ``FqNg*Gu@)C)Qvad?#W3jV*XC{`bxOwM-8~Mta-FhL%wirC-Y+29e zvk#f=L*n2Wz#v@GiwlU9SYWnQD^!v#kCz$-xh!TGDYub$bO;^<7pP=VQ?JHHFsN+^ z7Z3ws06T1xnfwKZq4!Q>ur?G|&l3bV!iwgVkm;wgRc}ffE1WESyM%4IF6!*f6?T}7 zWy0c|pgI`I4?krUdD|wO^At4Q%fj=>c^UC(qBKWU5*5X$!x~P!i)Ye)NI6&2yxs(C z@>=sSSVTARqUHc37Xl>-qJ407DnZ+Y3+WoN%%+Mq7NKxnxT;_wTHW&{dc7^XTg#k(bvNBJ*h!OgmXiry* zz!Vy`i^(27CNv!iDZ*$5G{&;wJOnFSz{&5o+-TpRF_3_#wnfgrk?qpCGWG|Cyj zTqMqr3r2-ZnULe;yf!F{yuQ5#>W0%|J||xAwFR7wAm$$PAU+`j#21`Ltnu@%i<`V1 zQOOt2F$1^?3)T!!JH4P(Iq&mt4#MPUkxPmOlrR$X#RJVDW~k;G`88)^^pX(BqELkk zRLF;LaXFuC@g^Z6JfrkiSX_9}i}hyTPh=JDONgd&X%DhLo>twS-(md#v8pluGp zsZraj-3+uwfsz{0AEHjo%yLOBNRsX@d!^-L;>jGKWTCRU=1|MLGYzIBFAYWo1kff! zHACkf@@=<%x^6BU$)zCOxub9cuFj`nN(a)#1hC!|Rcc+#Bq8J7YORV|SDzj|^+x;A z!GQm3)GT%m$B9z)*6a$`VN?&psL1A^(#OZ|Aqn16apHNJ!1{-xnJGU=X7 jQ*?^EH5?%=jaW=Txe`Bi;P4VaACS9}DZ+$-jorm~=nl{m literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian wheezy main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian stretch main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -68,6 +69,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -32,8 +32,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ + apt-transport-https \ python-software-properties \ - lsb-release \ ca-certificates \ # Install ansible python-minimal \ @@ -46,6 +46,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libssl-dev \ build-essential \ apt-transport-https \ + && /usr/local/bin/generate-dockerimage-info \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ @@ -69,6 +70,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 zcmV-zB9h%gT4*^jL0KkKSy*ijEC3x4f4Tkq0APRr|NsC0|NsC0|No!>1OgBM0RR9P zU@6{x@CnPCb-V!{=YU?uf=YVM>vqM#?^5@jdEMiE?~d3#qkvDkUw!x1L+GJ=+~)4x zWxL+z(V_LQdPxxLM=qUE&@GBp3R?!6pwyC-gH1@#wi+50Di5$q5i&*r5jUx(PgKfg z(w>@+MpMWdH6Ev_ra)*kWO|;HBWfO|fCi=!kRw2aG}Bamsp@)adY-4KJxv2Z8VwB% z0MH&&^rJuk2#jipsi%`j0002c28{-Q02%-Q003n51gE5sL83AsBT)4{G-{7&O{ub; zlhk4|G(4aI>L02aJws_U0AUn@OhZ5j6!kwzrY4Y2Q`1w_%$g>HC#c@38gIFqh$>?qfb%lGH+Bg03M@5Ko6W2|DV!+!U%}w4$z%J zU}F|OwgMDy1&BZgL;}ZI+{M;iKDixpvyD_1=rRagD*;@HU{jL1j{D!nU1H%Yfh-Kr z#5Bf6RD_@qB~VjT1&D!El!9GAXb1=-1_MA9T#5<=q(r8W6i`|bQBfKYMw+S-RjO1K zp=nTRsT61$6Q4m_DfI(GSQ78qa0UvX;^q5mnYKA_y0t038nihl3ZjETfqTL&BDzI*3 zCCgJe?A;nEGyaUj#U*|0rlz6@RGSVzgxG*LTJvtH*Wvz&Ecy7Kj*vc7s4HJ-__~}9 zOHuldi-kd|$zexk6e%iSpVHK@;DN1%+qT(ZY^rkPKE z>6(LCRa-dht+%A*mLqDqoe-tMENykB=A(JyH^_W^7HnX0k;tl0f)JqqgtesOu6V8~ zbdzG2?x#F&j`0nXosVsS8E47HVeqosW-ct#+M8{**tWzrN3mYZ=X86t${G@yPu@*8 z(W%1YlWDngmq_n@W5!jnS7y&6)%T}0zdeZaKB()LR~OQo@iS0r9ksNklD(smaUTpy z){gFho#($!^zyb&mg}!XmRS((JX-}fwpTtX&wizcCfl!;S#94$T*kAFax0VinWodD z#J8hJ;$7~!hlv=`Q1ZMA&huqjk!)>T z{>5*kjX1sdEf_oPeEb+#03=^k+d%Giar~Bd+-vp8EWUa4lj~Cfa6xJJvm<3mz_$7b z5ENH~SI6OMUt#9~{VapKhmY<)Loe0RPv?Cp0^bm}CQtS%sw%3gs;a7~65SezWg+ZL zoMKw08v70$q>?O>NnXWBs=3JGN>x_mMO9T%R^(MxRaI40Ze7Zf3nW#NNdie}xp9jW ztrZrdO1B_--JQvXyzP8nl3}l*qp?$Dj6)5lJCt#fNVKArvPR^#XTJW^M+7rhG*wX5 zjudg#+ z$YUIrdwvZHaN=AY+EX7!?I^$l9FfP9eJ%<3(9-`DLP{gXPyr#3?d1s}BqWMS2_YmT zgpiUFLP$voAtWS(p65?SiKTJZMCmbe(c#8my=-W(Ws+q{=$8UP|&ox!n8tseG ziS118CQ?>+r3wVZ5glu;J9nX62(gBXPCb|{JXq&^ud&j@ECspFARuYyAoJ)0g* zd1bbFm_2z#dC8Ub$9JdN?$=fMYKjC$-|UkRI!KsY1V}Ig*A|DP|nZ zs`c&V*&_8^^G^hZ=@F}uRnM0I<-4D_DAQabV8(&8fiZOV$)u7!OPPk%bDuwR$6-sxM^!eZj?{j>h9-TrFM6}f zq>=zy0AO*eARF)FijSCc&VnnxsEyb`5HYurCEdsG2sZ5Qy6#xw+j=Di>9mu1)mhTw zl0r+Z_%Vp8h@_eO{)!IWb$DYyT>f3f`DB11A`ugIK@f|fo>rGrBNGpr<~*jO8x_$c z_ibOjPGS#7#%=b2?XQwcUZ&gY;f9r~I!7sst%mQiVYl@@y_n_2C!h~LfiU^)2OQ|1SOXOhtQ2`M?Ri8xl$og~z*GgiZ0xr!Y zFvc)uQ`P`v_o!dg;(N}!GCl5cVDGua&AgcU_lR|ncU8W#r1oUGRjS$Jsdkq@xODcJlELSL-NT?$FutCw;A|*$!L6;iE z-2*vYDz;p&ijA8qoT}xBx?XhYQHc6?<&@i5vW<;htzU0J@@;He^Hb~XQ{U`kn4DFX z1F>4tIfN%v)a~UFGXiR;GtTAm)|F0pSquQgfFwyI5d>D0CQ$)FMDAD9)pHa2 zWgj8xf}|>ROK0jSEnx#Xy`jZ^Vn{65nv`9?-&w-=E~5_RBT`D!Fzihsq^TpDNxQr6 zN7+tAq7UTm~}lWlAqT2ad>YnTt4ei5@1jx%(_XSZ?!bO zFmv%kzl2<4Z82EA3*+JKr@Y0gqn1={SBN=Qj^&S(g;_ohy}hDxBdr2D*5C3QRTZL$bJFXu4l zD8fz9rl*wxzbMDH@V2XVE!Tl6fk~T|r zGzCt|qA3^*+o*}ndix(}jJ=6vx8(X%%65vwfAe_fA=2Hmj-83S1(_*II6BH=ZMY zGZ@XHv^ktY#Ri0e=M^=H?F40EdbY1WZ5oebyT!@;W5j(%P)`<2XJl)Q|{^1X(SQIeU z>zTG0DF|t;BR9~en4I;IYcf*1fV*N}TJ}_I#pekSpbdhdLP$aZv@YU*@vbdg|LI10 zefjRv;pz$1>bR!sYUs2LLRBVU7BUJ%1;3iV4v-c}7UAc-sB6dJ{2!ID?t61Vd0HW` zgS)K>v8a;NoixzUpZeGcv(x3@T=BD$TTeJnh)@9dhkq(;{n%rDWw|$HP+&r5E~E>vC;^~=UA?- zi43*ayj~^-w2p5JpuA_0lfIB${AmCfG`tuP)(rr(5kgR+yWtAI3ggSt}8k(d{@%5-trurK0RibbeFD3WnN#B61aSIP6E8m1f6e> zSU`dio)f#!e!Dg6`hr!mee6z;4Zv{V&V~vV4(IoP$|NE6F`_gy&>8LT@#}E&9tu%a z6;`DcBCF;2zH{&JpvsEi|F33eo7L`l^~a3g`xW;$4m$m#Hw#;E#5m(|$gUsQb3LCU zcv=qJ5eQ4K@L-wY9jNKF^q|~sd7CqqbB~Z!Qvt^vHc3KMG9zm$ZHplRF`OQCtpq}< zoMS05!l)Gt10lab`+I;0Kz;%R$QW<|^mwn^%Y{mnWb-Vw&|a(xhrm}2NFWJ-oMjHm z6a<|O=C(xz^C1RM7?!5GF(Rem0XV2Fz5!GY1Ep+piQ$AKij+}dxSSyehOB@>3Kz}@ zX+5Vua`968g2txT?IMaa=JAY5h-E?7Q%zN5vT9P1QlN8FHi?k~wVRoy7++e|<1q0u z$|uxaDowA3$TtP%xC4tRJOE~N62o#!cjB=Epo5G+4WMsTm-fgN1EW++-9r>(n1KNK zb;uW&;g7O`3=;WA;DpiS!*V)pS!?epuGVLL*G(>qrB<~mb*#&-x^d+pu~cuN2g?E+ zU=oifRCexe#M>8Q$4PS|DM^%AN4TPrpV$5t&%&%=d%nR4c3!5AAxp+AaV&|O6 z#ol>bnjNnauw)Qo%CQ@F?cI+d){<5gD}8NiRobJh$yijZT#oh=;J||B8G8oC$Pl0@ z(E5no#wbvVQ?0H_t)5K~C0w{jm5r-?yK9E1)i}T!HIoXvt2)oEepgXpjq`ym6v6<- zmo#SSmDt|~4j|A;)9| zn$53IsrpCvk&?1j5Nif2zyvX8kgr}qAZe?`OyH~vk;ir%ceW@E3!>-gu^7HpI1XL< zPBL>+M{tWqMWKgfbvO?K7@DVIUOQ_MtU!Q(zMWOn7jp`1aS>3&1{ih@ez#yV!$bvG zgE+=8tOZ8|FdrP(Eb<0&NlHn*WhqJB!JLv(k}m>?q zM{6BkKqG;gO#LT@&&p3!%4}X`u1o$b_eaY{z^?hLY0v$ zO2djoUPl5Io_L-TpA+2MDE3S|nTozBVeR9HqJpF5@bPnRKTv!@nBhN=a0lTi9OF>z zK9Yelme%Rd&Z?@2h=_=)s;HjO2m=A(0%Bk|fkcbi{!FSxjAI5_X(WV_N%B@f?$^!2 z1d%MGZB?osv)TA~l1*|e(RaH|~w4H_rUIu0WL_`1p5CZ@q zA|e;hqx+nAXP#NP=bm{J)~c$w4Yxkc@wsvm?!}F^`VLxsU2kb7F>+$@B*r%ez;h1$ z4zPrl90Q@Sa1A#qs;;}$S50~5{4;lMx8l^Qkr6~F zA3$ejC;#`%E+#Q7FdiP&=_1bZ%M63GsCg>GncKN{h2eR~t0eFO72^%(w2sGlxHLL} zd^P2FcYyELmEB$4oV8w3ET<(^a(>j}YJ=w>Hs`ULH3GcxYfYRaXUXIGD>4ER!(q&vI{`EEuvbbv`hQGsk-tJ8v?{8oCl`#NJli6ppI*@Q*hYE*xN~z zFiBk3v`c~fOw`)Ff}fQxc^XULCh&Z_Ch)f zj$*;5Co&RYU<(YgXW){MB;ZgzkMYbi4hep~N0G?~*|eLME-+|nHS=efx(cL~L1qv- zC1Mn2cm9VVEhi9I&kxlakg-9SN*)JIK!fDMkb8GiW#hCOV1k1Rn1v)=UiJXQ@1@Zq zDt7x;A)KrRwK;6awJJ3oV(HAemcc;y474{nBHKDWNiS$GL!W)P(Z<$L4k+{_(;`ru@zQ3grCbK%Nb~SPWbZPxvaed(AshY z(ndSA8#u={TNI>rf)U*Dn1pi`M-YEMMWJ*FtVpsEyc8GS4f_f;C7nbT0?k|_)7uTD z$TqrKA`0`-{7rIaE*wKkGL#gAg~Lj)pwIm6c5M^Jp$im&izE9_5C$e|G6*!<5|+~SwTDxJ zF*z4|hZ#~`eUqc0HzgoR0LtNY-jsbB4!Kocna@k2nIYCpv&yO(V>UsCA8ag=R>2z$F)`<# z!(8Sm7y+3>5Vg_TLJkfDN>VGv$q_bFCs_28Ra3~$R;&P<2mwITgc8n^v_?{U#`0hi zsHzV$BJ6Q-libN>q$`i*%t;haMSxTsOE|GM@WB&<*5@Ybwc5}P}R!r zq~k~=hN{V16{a$<$E~PC5mPwI>?rOMqRbZ2Gr5h6X_!}2bORzw&1N*s3}{)L(jR&T zYEXpz^E@UrP+sKi>GQ!K^oe@pa2vwlTXk*UUmCgFa=8U8ue`f=aA1UiF5Z~}`NUIr zY#eAniZ38$fW!wb{o0@k27c^Ew_E<@#U;Db!BiJq#aw;JXftTN2d3wax3o~{BWMQbZwVnA4dN{cQGswH zKwCzYEEpZ_CYafAJ$&2xvdrF;X+V;LBPI&8;&am(E)=&YffO7vgCUfRfe84XTMc8U zzIWl7xJphN0VS(oINczCvZ#Ar=Li_<}@S5A*C2#V*_0UG~Ei9=^3B$gqOR z^1#Sh0kG%xc*G&`deGJ^NJx=_5Df(wD#N6NF$uW{fK;KcWOxV=6#EZ|P`v|UP{ANe zWSyr8N~ zL*@qM^v^?n0Cl|5NDmYn>L!mkK@gm@D26oq0uu-vM@U-Y>$7bcTrj6x0?8&27HSew z1)5GlNzM1YuBz9M^1P_fyN>eYx0hQn5Y^Hh+HQunG+tUV#0oLH_u8%qyqcI?TgpqPUjh0?;MV9RbtT zDNb0#svqi-X9yKMGee>AK11SiDrygOc>9TG)M2Qx;Ddr(^+Yzql43|H>!BVxz%V&K zr&1E2X%GxoFlVuF5Tn4^aEJuAX*E7I;NekSW6$r1Jss$&l5y2NA) z7J)VmfHo$cA`iSQAo~VTJOmpqbGJw{39tZ8lk#qTnwPbsLAyL4KAQy^U z-N+|^6*V24vg!wr6iE8X4XeY&uOq6>hm|!UlD(`7%EYkb9ifynok5r_Lk@lMqTY89 znji`U7O)=N4mJ=Hymir|k8KA#z~B%@s^J7&n&gow5;6mja}^E2A(>HOiyOQ)1?Yf0 z^Y>~;pc0_gKypIJJCHnDP!d8!!~TMtl0v2^OdAWTwI1phtDRUkTQY?X zmSe6>CPw|6jC4q5TB&OqJwRTv!@*tBT8X}Q%AOyYs65&+79vB1E^#3;YU8N1N)T?CN|18|(Cj^7C5r&; zFjr!rz!Cd0ONs^?0JexGRmBq2u#*y!AQ+KQx?s+;6H+^_6s+SALF~&L z3q2SG58(TXhXcS4{v`~V0)#K8j3oq-Y_M6F^PD7yOg^zTPcU$hHmBv(3(0^=063OJ zyk-e_^ZqD9Lb`5t7<)!EEOA*|xl~}%Ma6eDDh_@R*W=ij_&KyvV6ZwQzOsTUUJ^C% zz-&2i5S+u7a86Ord?8|d6~f%9-f&HvnTND*>Ov{#f>3C3$4MHXf()goUgQaZPT!J_ zN`earJXb-95)cJ-wa{wnBP+(Tyw&)SzFePA8W<&t4B*H?1Ol{FM*t2i0FIbLB||dW zEKD<_fX!PmCRLWitU{lc=dB$Jn9_klTUvnUrUX!mTm-`c0ul}&jY|b1P?D$?lzNGS z0^owoY(2DXw$*&$ecJ7JcVLKCMI~sC@&*JTXg~}BhVl@LA3z$R3E}S51w&!R1V~t7 z9Xq4>XrZdLQE#Cl2|2TTXpdi|d%1?9>MCq^&noFQZuJ_cZMyPz?&K!98k@J5wGiP# z^ySU597cu6l?*)wGGJ-58i+T11PZx*wBrE3P&_b*<_{)B%eq1H3(_r|n#D9L!thYu zK>``UGr+%$0vATPX{-bh2#^szvkIcDQ2hD~k3SI3Wa=p{Y3%p9+sk12<9g*IC4)YZMGCz3|1ym{xv4jM|C zZoJUjx)?nMrgR&fe~grVZ-YL0g=h>4sDznOq7r4vQ6!0!HpN5X!UJ1$Gz=0paV#9c zhj_%g1_TKmKBm@TA+Q)!U>e2&-L1Z7=_qtQZ%}GED~lk`1R9vAZrEVKpw$GAw8C7u zF6!*cin~lkvT(SkBnLAY5cG7Qoo%UR6_SQc{N7AQ$b5{vxiTR%FhC(mjmtNys#RW( z^s!++osGcN7Zgt-yaM4Vn*7H- z8VM)}y`(3b(}z4YAz`3>LJeLmn39V6O44{Wgu?lZr$_+9&MQYDp+Hi9^o*15;skz{ z+7s2{?+ULkVMi1kJx7gp@Hp5L~e!VO2=>pvxjquwpg%t0(}) zVlp72p^-q-TnH}%0fl5QIh72k(F@aLGR1|mG0p*IOreU14jpa{WT6|2PcW>8!&(mm zr(mQAd`w{E4uar1f&@uNN>A4Z3|+z~L6+_=Kq} zXk3EGy$i_#IHDK|gZ27g+dg<3xY$`0rkTF-qLZ|}OqSjgi=|TihRtP{UlzhB8$t5V~ zmku4J1+0SMg8g35p>SMf96=JGW~6cnzd0$QhzQR%15CElF^mqO+NG+#gTTBq?&0SA j^6?pehbyRz_TQ> /root/.bashrc \ # Generate base locale @@ -27,11 +27,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -67,6 +67,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/baselayout.tar b/docker/bootstrap/ubuntu-16.10/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 j^6?pehbyRz_TQ= 14) or (ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 8) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index c00235337..e8476bdb9 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-hhvm-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index e552cd6f2..d09412e65 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 7e6b49afe..30c3e0ea2 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 05d77cc54..88b3ca7d2 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \ + && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ @@ -28,8 +28,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 924bd367f..bd6c95cd8 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -25,8 +25,8 @@ RUN /usr/local/bin/apt-install \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index cff102307..87babffe6 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -23,8 +23,8 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/control.sh service.enable dovecot \ && /opt/docker/bin/provision add --tag entrypoint webdevops-mail-sandbox \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-mail-sandbox \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup # Install Roundcube + plugins RUN cd /app \ @@ -35,6 +35,7 @@ RUN cd /app \ && ls -l \ && rm -rf .git installer \ && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ - && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php + && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php \ + && /usr/local/bin/docker-image-cleanup EXPOSE 25 465 587 143 993 diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index f82567674..ccf7cb8cb 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index eb22a35e8..98c8939fe 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index bc11cf563..362afb3bc 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index 9688f8538..a06c9106a 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 495e4dec3..36fcd71f8 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 09867db38..6eb5946db 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 47523ef4e..b1b76f0b9 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 00e18b89d..4bd650376 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 45aae883c..83e79659a 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 1f5151cb4..33bb72605 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 0ecd1a20f..24a0847a6 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -19,7 +19,7 @@ COPY conf/ /opt/docker/ # Install apache RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 1040faa2f..2192d6eab 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index be7e92ab5..7badb5dd9 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 7e26d64c2..971603984 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 4cbf5ab38..a96a68473 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 9f3ffde21..9b566585e 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 9aad4af44..1dde487d5 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 29d85d0ec..cbc7985b2 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 791a4b134..bab53f52f 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 732ce20d3..9f0373356 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 7295a41b9..2d64fba27 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index ad78b5abe..38ffd1165 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -20,7 +20,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 6402fdb1b..f8f344637 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 2dc02048a..3d68a1ef9 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index 55ed16b85..ed65c9abb 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ 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 --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 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 index 2be18b0e0..4df3436ce 100644 --- 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 @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: 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 index 1a3db9bac..dce03a1cc 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 74293f318..621ada4ad 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ 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 --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 924a5eb8e..ec6da56e9 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/yum-install \ 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 --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index bea517d44..15e2a1a21 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index d0b64dc51..885fab26d 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index f868ae6fc..db604dc57 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 75424fa23..336cc0267 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 2aa66f626..d741be206 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 3c8485a59..888b88fb8 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index c61432ba9..d9d0ca115 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index f6f57b629..b9c946690 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index fdd141b42..b7d07e2dc 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 40c437508..66d1454ba 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 693dbec9b..cdbd1198a 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 499a227a5..ca72f0f92 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index e32a5eef5..e33426a94 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 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 index 2be18b0e0..4df3436ce 100644 --- 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 @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 85f333a48..4a15597b8 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index bd5d5b4c6..472d779f6 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 7773eb024..a981e9662 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index b3fff5338..f68edccdc 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 0123662f7..9e2953ac0 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 73d422bac..55997ea71 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 3a5ac53b2..231ec2076 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 77a9c5504..3de008a16 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index c0fdee1f3..b3a3f9003 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index b39e469a5..fc759ae00 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 884ebf8cf..eadc17829 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 1ace16150..4886a5901 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 40412dea2..69189b9ce 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -19,5 +19,5 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php7-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 0ca5b4565..f7815ec2f 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -19,5 +19,5 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php5-xdebug \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 91d83c541..2d4d84b90 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -21,5 +21,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup 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 index 1a3db9bac..dce03a1cc 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index ea12d38d4..f7d659988 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -21,5 +21,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 6d9787d0e..ed021f841 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -22,5 +22,5 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 51661fbcc..d4ea34821 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index fc369c00a..a6df9d226 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 6c077d718..1ae296973 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 9bbf28516..7f1daae72 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 7f1578b13..f73d8e1d0 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index a92222480..d7e2d5712 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index a130d6bab..240f389f5 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 2ec19de44..3c5cf2908 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index ad3e1edc9..6d574de82 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 3d3752800..ad3e305e9 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -23,5 +23,5 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 4e8a1d541..d5a80944a 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 5dfa6dd86..61ddfd189 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index a7daf26f2..5e8a2f3a6 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 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 index 1a3db9bac..dce03a1cc 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index e8fe8d959..374e42c73 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 314777eba..d9fd15163 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 2a4679085..c45ec363c 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 0901bdd5d..0dfe1d206 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 05da8876d..59fc64054 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index ddc584031..cd70a168f 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 359650c2a..c4ec7a6e4 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 5d3fb3f0c..fa82cd0b4 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 1359c2a3c..40a7d7e33 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 65bd93ede..1db5a3a42 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 8ea4bab8e..5fea027b5 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 12ce1c9a9..9c7be2872 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -22,7 +22,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index e101f74c8..7987463a6 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 604bf6177..9395cac2a 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index d26ed0350..8aa9e0dee 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 6a549ea5b..7e3753f98 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 3b6c5c51a..5d7ed728e 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 8e6efc623..34025e104 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index c8d6e1539..a0a00ff16 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 7e449ef3c..47f6ad73c 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index f578b3972..2b1f980ac 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index c48274f8c..fb0305574 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 6172a41b5..63037e69d 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index a30ca71ac..67106e006 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 17e4b66ab..d116c1b9c 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index bd1934b68..6e528982d 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index f10b080db..3bfa7fbd7 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -21,7 +21,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 43adcaa97..22b0a1428 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -78,7 +78,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 3db15f23b..7fc09173f 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -73,7 +73,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index f5422aeff..2cba1c770 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -53,9 +53,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 6b8cde054..ba5fb576d 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -61,7 +61,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index a6a12590b..b00393749 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -57,9 +57,8 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index efb4d49c3..75c17ec70 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 48a8a215c..9d237a0e1 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -58,7 +58,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php-apcu \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 142fd95b3..e89050d6a 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 570de67be..fc85e8143 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index eda86919f..c9f7e28e9 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -48,7 +48,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 48b66770a..52c63a949 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 918037e36..4455b699b 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index eb1b44bd5..f428d4014 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index a0d3162f3..107df430f 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 15e960fe9..7c76f4841 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && 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 - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 9000 diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index ad9f8a153..9946622ad 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -14,7 +14,7 @@ COPY conf/ /opt/docker/ RUN /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-postfix \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 7b7203de6..019ecd062 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -22,20 +22,21 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian jessie main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -73,9 +74,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + && /usr/local/bin/docker-image-cleanup ############################################################################### # Base @@ -91,7 +90,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ @@ -99,8 +97,8 @@ RUN chmod +x /opt/docker/bin/* \ gnupg \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ############################################################################### # Base-app @@ -137,8 +135,8 @@ RUN /usr/local/bin/apt-install \ vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup ############################################################################### # Samson @@ -173,7 +171,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ python-dotenv \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* + && chmod 755 /usr/local/bin/ansible* \ + && /usr/local/bin/docker-image-cleanup # NPM stack RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ @@ -182,7 +181,8 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ && npm install -g gulp \ && npm install -g grunt-cli \ && npm install -g bower \ - && npm install -g npm-cache + && npm install -g npm-cache \ + && /usr/local/bin/docker-image-cleanup # Deployer stack RUN set -x \ @@ -203,7 +203,8 @@ RUN set -x \ && tar -xzf /tmp/magallanes.tar.gz -C /tmp/ \ && /tmp/magallanes/bin/mage install --installDir=/opt/magallanes \ && rm -rf /tmp/magallanes.tar.gz /tmp/magallanes/ \ - && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage + && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage \ + && /usr/local/bin/docker-image-cleanup # Upload ADD database.yml /app/config/database.yml @@ -216,7 +217,6 @@ RUN rake assets:precompile \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base --role webdevops-base-app --role webdevops-samson-deployment \ && /opt/docker/bin/bootstrap.sh - EXPOSE 80 VOLUME /storage diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 9fe660194e3b016f14afce805a95f01591724e32..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 100644 GIT binary patch literal 9593 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 literal 8813 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 literal 0 HcmV?d00001 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index c70ac4ffa..3719771ae 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -18,7 +18,12 @@ USER root COPY ./solr/ /tmp/solr +ADD baselayout.tar / + +WORKDIR / + RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ + && /usr/local/bin/generate-dockerimage-info \ && rm -rf /opt/solr/server \ && mv /opt/solr/example/ /opt/solr/server/ \ && rm -rf /opt/solr/server/solr \ @@ -28,10 +33,12 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ + && chown -R solr:solr /opt/solr/server/solr/ \ + && /usr/local/bin/docker-image-cleanup USER solr WORKDIR /opt/solr/server VOLUME ["/opt/solr/server/solr/data"] + diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index 7530f5ed6..6b371159a 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -4,24 +4,5 @@ {{ environment.general(charset="C.UTF-8") }} -USER root +{{ typo3Solr.guywithnose(release="1.3.0") }} -COPY ./solr/ /tmp/solr - -RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ - && rm -rf /opt/solr/server \ - && mv /opt/solr/example/ /opt/solr/server/ \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/typo3lib \ - && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-1_3_0/solr-typo3-plugin-1.3.0.jar \ - && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ - && mkdir -p /opt/solr/server/solr/data \ - && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ - && chown -R solr:solr /opt/solr/server/solr/ - -USER solr - -WORKDIR /opt/solr/server - -VOLUME ["/opt/solr/server/solr/data"] diff --git a/docker/typo3-solr/5.0/baselayout.tar b/docker/typo3-solr/5.0/baselayout.tar new file mode 100644 index 0000000000000000000000000000000000000000..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 GIT binary patch literal 9593 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 literal 0 HcmV?d00001 diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 7b9e18545..b9df3d351 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -14,17 +14,20 @@ ENV TERM "xterm" ENV LANG "C.UTF-8" ENV LC_ALL "C.UTF-8" -COPY ./solr/ /tmp/solr - USER root -RUN apt-get update \ - && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools \ - && apt-get clean -y \ +ADD baselayout.tar / + +COPY ./solr/ /tmp/solr + +RUN /usr/local/bin/apt-update \ + && /usr/local/bin/apt-install net-tools \ + && /usr/local/bin/generate-dockerimage-info \ && rm -rf /opt/solr/server/solr \ && mv /tmp/solr /opt/solr/server/solr \ && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr + && chown -R solr:solr /opt/solr/server/solr \ + && /usr/local/bin/docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index 4a527990f..3f257ae1d 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -4,18 +4,4 @@ {{ environment.general(charset="C.UTF-8") }} -COPY ./solr/ /tmp/solr - -USER root - -RUN apt-get update \ - && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools \ - && apt-get clean -y \ - && rm -rf /opt/solr/server/solr \ - && mv /tmp/solr /opt/solr/server/solr \ - && mkdir -p /opt/solr/server/solr/data \ - && chown -R solr:solr /opt/solr/server/solr - -USER solr - -VOLUME ["/opt/solr/server/solr/data"] +{{ typo3Solr.official() }} diff --git a/docker/typo3-solr/6.0/baselayout.tar b/docker/typo3-solr/6.0/baselayout.tar new file mode 100644 index 0000000000000000000000000000000000000000..dcac04c19eae2ca0aa4fea75a77ccb6572a95616 GIT binary patch literal 9593 zcmV->w3Y!(AiLlj~B&bku$VrGy1OS*o zBMLnk6U1mp^o&EwW{CY$(t3KHsp$_;XlQy30x|*r;>S3NwqNm13)wy000Km z^ns87H8T}8G}ScqJwc{`41fRt01qh8XaE2PfB*?kNf3m@1Za&KYM#W&GBl6TPf*dL zKzf=D0j8O#^*uqL00Jn40%WP_qMn|UMEywrLQ~p_wLKc1rqVqK4^YwSG}?xNw3vVz z8Ze1M1ZV&d5s*y`lT;o@5O4I3i>_tV<4MLR=fCa8Hv5rzp6r*f= zidL85e3xmIG~aeNh(OY?2oa1Ff@Y9d!W5KY6(AH;2%uDi0SGW*R)YZw1W<(nP$B@j zgb;%SN@)Q_1)&uc5upTWs-YEHr9oO2l?+O%f{g=0t4fV1h@g!MA`4W|2r8>eB>=Rb zBkJn)ou7;ApVwF6(;v;X9>Hl8X!$6raFf@Ig)Nlb8l`2(#wx$hAf+udC|gmbtn#SS zj2T%d!E!i@G>-;T&w*X^4`c%XMSbQ(S^}WECo)LLZ(_8{X?RrEY*x$)U2ny%<1msC z#+qV&_ddVNr=~^u#qE_NL28g>J>wSEfYP*KBK7w64RtWWXk*;WrC>C1e0R5BC5q>^ ze;PSZ-b6Z14Jo^bL>7mcbg&#iLQ08&0hqnh2A$ROAA(|2YA%6fDc|GCZgepbY*l2^ z@|yJ_37>r5Q-#vEiuxz$Wl_CSX9f~%J)X-ELJX0e@3&EbW#^|me>Kh8dts=%TsXkW z*A*#G%)@%ME>#AJ)Qod3!4oKYrV*Oel5{(P01ryb;zsanLPiO7HruaKg|Q`eA1CSr zI}0ePC>;bMf(e=^A@O^Je-;0Rnul@`1Ql3MvAo^_34joNg5?Wu=mM((_L%0WSo}di zl2`fqIm`18V!zL(LTJ%1Nj655DBoO3Ps(ml7e3iVY}x43?2yw;t!7l{C;;)GDiIL( z)59pdD?}?lnEjTj|6ZBuw-Wc*c461s*X@_Lx3jh#f#{yUw~_Imf&Rq2CyV`QC*KRxLNoh* z*`fZ~=U+#jxu+jR5rQ=A&!o3!-_DcHvb~{_s&nM6E8(lf7;&bu#z(KI=;#MT(r05L zQxz~2+SR1EX|1)c7H_R_=&wC^>(pa)=XBq2XnJ%&&_=C2_jBcUruE-__tyKE-D2m9 zx1|dhdKqkNi%;geaoOw1wdj4gpE>l)jyOw}ZF9Eorc;D*uQta$%`{HAaL->XZC*U6 zj1h!C3(ku?URgd;@ksA^afJ^NPCY$T&GQR>^}1Gh$&U(aeNK^l;W=639c*0>zk8!O z-?3G+94RYg@Nw=t(dk%`@vF@weO;@G;%n2b1sHF4J9O)V-D|~@hrp&=MZP_$HkZpf zIHhtf2{#894elL5K?DL_);Ea+IB$b?$5d8Ufh*TrYfW$yc0HSYTYR7CyW{o!^F>Y4 zL8M=Ee4CoIJ=?tCo`EgFI$24C!GiMh{=6a>pAK>TCq9FsXk z(DI;&C_Cm)rzI}{076Y50~3JV^k?EXqXAar<zW&ok1T%9Lbc&|A&1QGcj5x?Yj+Qh$tFITr=;%Vvqqk`h8lq>z#l zLP$voAtWS(kdhKYNJ;1G_w`L{qis{JW8^wBk3W7rc{~~u9)4QmDygK7oOyb$Z8TL~ zp|>nvtWPA;;$}+H=x}fhsug7!v+ZV%VJvQynM)hs3N^<}VuH0)-&Idchg^i~yQ{mp zxe0e-mv?=kRng)&^E`>>HQ9dsR^U4_Wc6tYBAjF-gp#Kly1TnBLS5LZT!fI4RJ*d| zQb>BFd%GyEb<--cYosKEkdhKbB!rNgUDe1*2_YmTgpiUFLP$voAtz1M;}%`olB%y> zzN!KR2h*^t#qJKFn8og@4)P8w+TKpV%1JcT8Nez6h>Ous*2KUPFo0bysBnS|4B*+(;v2#68Wp^&S80K8Ur;n$zrsuvcV+lYt?AF@o-DDa#_!t*NAfw)6Y%)X}_|1D_wd(>B>{-mG{YU)oWiHXf$D!v<_TE`$W=q&)JcGR{NomR4$fh zP$A;_EEPB@YVT)@XO4TXV{n~y(4OiijyJIfjTO{*J2kNG?)2ve%{O!2XC2*lYoSF* zBD@PVxOc$@%JM=OW|c`1V9fGZTFQtOR4TMCgBNh_hGu3A8H7rDo{<9Dkan)X z`T4cT&qj&@voaz_L1sk8t5pxn27*9*QBlCI7Fb}c8wIDl>j580%D4UjeQxtW*{(@D zymHlb(CbchrWfVE?5!l93E3P^rc^0UY6rC)cUnRakEJv5J6?_VTz#x(rL8A|I?9}E zQxth4O7b+l#XeUU-$I_+)RIP-<;L8oxbcL~G}XU#wzssmT--V|CK=jfSdrhGmYne|yLFd#n3L$#wdPpcO*O z@q^D?MFP7m-$&kX;PPvp%%bofT3v9FO{>DE)`to?0C7SHOwS>qz#t8S@W`o=Am79* zBSjZh7eNB*)Xa#<0GU4Hj*Ew@!x)c&C(su9Hmdq?I!-R-zM6jyihR7c=NEz`UK;CG zMo>lMIr?@2`2*(yhIRsd?QIB&|nOp1qnn29ODI;pcE8OhJufy(1TU=-QC1u zG(?wWsFU%Rg$x)dtkTdef7rj?fR;qLuq^~+6Ec{j=QM-Zk*Fv=C_$tIO8d(yfQemV z6+XlXLO;d|3!PvqQVAg-LIOwu7y}pp#v(Exk|G3xjEXWLVz?h~UW<{(C*Oq%&gfkL zwLBpAs}T!`c|At$45xR-5#`ewZh0Zlc6jGRv;`u|=Je8tVD0TY0CXm(uaX(ikh|6o zAl@&&#at-Tt2~6QlY|Z9$6)=v7 zWJNB#Ag9qec~gRm7|+$iUZQ!{19`&2=V`){F$oVR%?daDB2amR*pK0R-XXtME9+z} zB4wRJU|9x4GBVn|UI!OhP8d3c^$Nh)QmC8a+Gu(iZ&z5C#+!{LZRv8g{`}+0Wx&4d zzWeM80ALfm9YU}h&9MnXPo9I7kj#3gbVEXDSLq8PYAq;#UqI4wqD+at>0w5sc@=3*h#et zri5qmeCVm{Pdolkr(Dys_)!=n?60J5&%fwN=UHCR$yGV>R+aG8;*2=cS!0%iT^>zT zqDVB9Y-%u)WN9W+YS_FqMwCmUc6=+EkG^bG->+H=n-%4{;EI`soc83LFw?Z5=neEE z$10t$@0E$%LP-jiOfq!17Yedw)1v?9$*K5pKT{;Rwd38co!#Btx9%~)V&{vqquy|O z8zRDK-6-hB^Unj9zHM!!w!N)gUl>gzYTt&&nNJjLj~6@ZUHH)$BSY@ZqWH_-G$<1*?5+Yw%F<&I5!5(^CSGIIu%Gt8t@q zj)=GCrLkj$Hvc78$;BvNgdu=HzUPC!3N(Fx$?;6izB?Ml-sb4V6nc;fJ-^^|pC{G% zJ|9-W)9HKN?!c$aAp#Fw`=@ttVQk7V>C)-n{zIQ)UBE6cEs>%DLPIXerPyLPd$);p z9zc>50w5ZdC`uqiBiSkP@0+ciKeso3e(l%lGf>z%9>-hz zuEkBnUF%3Lu*5X>I@grLG0ZiV%N7wawzI*emE+@OaKn9~RSGI?LNA zX1%Y_gsvZ-RNxMvfDI@>e;4f91Q-z-A47jJ{rk3U`-u@kExpZsq2}Zl+Q+m3k4Cbd zAA|^$nI!(PFp~)kAYq3ui;e@g7I{w%D5{F9Qi_pP(?{F(e)0FZ2oNCNPbH5UcsI7? z1WP6yq2HMEhYi~J#*U@808sxtGK^3{-jV=vSe8vcv9xT>cLtjVbaRh@>DF0G=i1>ak%nNGDYbuRW(mg~I-{A%GBF z(Z&i~ViXGKXkW^J+=nt2y7RRw(<(K(((2jhWUen9Du7tAz~B%loAhzfqx?GVWBVfr z$ocS@$zGI+N=H>gsPEYqc4@TUwXB%xAu%SoicXG&yTsRVh9tDO(Jrj2TwHm zoC2T(@UJli2-1LDMr%y<=nk##L81<<=;~6GgFNP8-POB73<4oi1_Ab<2rhsLN0YH0 zJoAYw;avcTJ zNtYLTX64}P*s9PM0V4bd0)q~d4vzjvhKO@S?>j89#f(EFIik$gk8KO`AVX9*c|{aG z!JvF#;0nkHm5|fMdI{U%-FY%h=Q?dwl{Yj%N~EGz;-HFSV%~k3LnbnANC3f=j0qdb zbOXv?jo7JOuW@Y{-2mR2v}o&_vAy+W@+h-*170A&r6?NU4K61(R1bMV$FbaQ_4r-o zv&+xGj9oqF(>p1v$oh>57Ls;h(qgFwCD-X8h05wIR zmF}X(1@UmWGc|~dN^x2>WE92$u^rE?q(fW{K!F4}&=3+bG7_Q0-FONx0$p|PAMNnf z+HTcU+>r!So9yG&*PLjoM2!ndq|(OdS!7_XRSXChR7D1|TpEK+gjx3}FG5D8TEF zs6Y^}J4wz-B1t5al0@SGflxBQv|0t>NO2hcbxI*5gL=s!B$9m9ko4El!UT~lqmIg} z1M+R~J#!XD<=?W7t_rI16j8`-DGo(IymfW*NhK;ER}Ko==4G}?Ew{+d7RKpI9jf+cYfw~J;bz8YIhmY;0rQ5I zVt@B^!s25R!vWvay>cw>EU?IR6%T5xIh|XVcwQHrin31tAzm=vc@g4w8-r7@3*omb zySxW>+^*{G?B%lZk!3kmUO}K2qKc=>^N&Y|R!r|j*g2Gj1BfBtTzYQnUmLEv>s<0I z1;gBIBMG25hw^74X$(Wp0PYP;2NhLtR`a07aU#hy4&65<`QL*UY-r4YcmWt4p+LA9 zeX)jVT8_!WA|*Cp%@G>nZMQ}ii+{O#x(N60V;6%r6U1Hg6k*-BHfczT6S#pb~X{nb z9FBgQY9Y9}D5?ukgSwZaW~T}G>Q*(3h)Pks&n{HMS~?NTER#XkSfTELY971R+jr#C z3N+cF8Vn1~A!?6lj6jPqwiL#~*7M!zf*XtAZb!=fOL1?`VlxU8_sa#V(!N0hsE0kP zz)d27{3h%!JCk(F50A2o?hPpW_2Zgqikc!s?by&7!>HDXQ6wK;=(zE2z&M5h?KJT& z;cGy`=TL^^D;;p50)^=4GXUd6Fot+c3R?FAz+Fu~nXtsd<7c?H8v0l`r&l_MxZHV# zP$+53fzQ2mYQ0NOa720`-eIOF8w=1e59R%t28bsSCGi~~pugJ>XCMnV4@&O^1&N0q z%0E}YI2sUfcs4;5_*v6>8i%26##N~gb)A|vz^3|u(sEc;sJN9k@1>CbvK98_lHbQf zAqpv==k;pXfPLRPR7lVzi__zk-qzNSkVRlOJHBb4b1u?h^ z;e9?c380~T4ivRk9)Sah-mYl;wuU+cA)1CG2SFHSw~Fof0)pG3SXu&t?KKVtgGAs7 zf(C%aFHJdx^8H)ADq}ndMaG_u_w0%m-K9p?UlUo)Vrg7MZ!PYQu^naqU3Cp~q8YLs9)t;}IuTAJ3f2i0+F=7;W)fx;7zP;JR!~5w-wg^ZKnJM}MrvRrbxrKc1JjBf>_Dpkfml6AmhiN!hG!U- zCg3fVm|-?Otye(oAR_nNpp zd$CgU43W~sHt*0UI35+seIknwvQ6SK0Xu(#TPOY(>q{^6dkfQ?=0Ff~|0TaA^o6V%R)m~X@I15vr;RM&X zctVw}K%l^8FckWe)5K&5y5dte{0hr>$7YZqp0dNBFbLpN^f`G?)@P-UTgYzgYU??u= zSo=WS@QKQn9bpo;JfAAlR74b3sa3Xtu4Ez!RuWOi9YANGx#B>kO#@-d{egjUE{&$m z<9(ZuvjSdjQ3bw|3V7C)u|VVR3xdZmhcNOD1E@8n1HX2X;H*U27T95ADgn*M7~rrA zwIF6)(uKjk(>U46$m&VAjQM&znf2rQ0{~jg8MC^DNF9Qqn5|P58;9K-W3yTL59Uvan zIh=?>D1znJzqmY%!x8y#lUZ?)ePQ+n{gImy(l03&e8_A86H$r>>1q?&AGjWtqm_MY zwA>s+Hq668)PoQy!Z;AeH$0@$bQZ{bwU)60cLN=XBo5VRBt@6=Pxb<`7L27{dYyNW4b*GdE&phMd6L@DBHH)}FoqaB=di7wqs zPR(+#v6Ll}U}%Xk!jjwqhmdC>b%d=bBfCTs-tE2R|&_h)NHX&;}s41cd`BIIg1i=CGUXuiC#7m8bgsd>IcmZWT zMMHbzfw1pp7h1GNyo&(S|2Gimj0~Iy;`zGrmW9r~0=n@6N3z!~M4C)jJ zJ)Q6j_X)DLAz*_DwUi?XDr~D!3W{k1m~@(KLY+3t;at~ zaq^T+T@xgASnr!0?iUEIaCuUtP51_8A{;GS0)p<1(9H^A@aATrPWnciW=2GTqTZJy z3U9k^xUqnLpuHbThLP${Mkk`oql^gBg$Tg*O30nX=Cc${2Wh+0kFg5@X6gkEWiwnr zk`f3=B!PL5y2}Nmx@xmRqaa1zOj?HsUIp+d?T(oUnn|R5Kp_|xxzLa6sASDa|F+NpL%*W5Jg4w0f~Fx{VJVH-LhNDOWD8Iu_!J#T9=*T$B+5 zQ#h)v2}sbq9rcZAEgEPEpTdO(v}ZI1$BU$vm4dy|1DKWe4gml#`*KeS4d8`jK=7jn zR+5PW@&&RUjSrMf z1EB^*GH^$2izsJX#knpa(xFSC=9NeM2iPSvzz*^tb;mZQfKSt!9T9=N3-zN~xE2mj zV!$dbs6b^4gDQh7brtgFiQ7P>^_;%DS|U>JAd#gJq!KUP5#h5Qi8LL+0%zh-Xd0?Y zhamGj&7tC484%oKs4)>0frT3)LGwf2M7STJh+tnF!}wn>Dx1u>vJjJ4{UMQ2)2&*D zzWd@*DSQb5I&?;WzPr?@@mRRI9EGkxhk^|5F@lE$XO<1{3zpMSQSS(SDU%p_Knowg z_m>AF#0@7tMaFPQ$Oon8%E>}+v8F&&G~Rinj}$$^jJ%=PgNpucAcuy)qyX+&LVhz^ zXkTB^5vuM$;gi7E{ewz3xZieOY+U#o(qhVnfa0pXMhY@) z7BnB7^1$vq_6Sy?=U7&g-KHUWe{$`Z>qGD)4T;akX!^e2s7Y_x3PW?Md`ZF(g^bKZ z(B>6F?|<-FSP3RrZYmY(@Lue-0A^HFy8@JPbP(`AM z1jaCeqBtHENm`-AE2#TWN6NkQ8aRSNdKxj1!5_K>NR(M{X^3fqJ``FqNg*Gu@)C)Qvad?#W3jV*XC{`bxOwM-8~Mta-FhL%wirC-Y+29e zvk#f=L*n2Wz#v@GiwlU9SYWnQD^!v#kCz$-xh!TGDYub$bO;^<7pP=VQ?JHHFsN+^ z7Z3ws06T1xnfwKZq4!Q>ur?G|&l3bV!iwgVkm;wgRc}ffE1WESyM%4IF6!*f6?T}7 zWy0c|pgI`I4?krUdD|wO^At4Q%fj=>c^UC(qBKWU5*5X$!x~P!i)Ye)NI6&2yxs(C z@>=sSSVTARqUHc37Xl>-qJ407DnZ+Y3+WoN%%+Mq7NKxnxT;_wTHW&{dc7^XTg#k(bvNBJ*h!OgmXiry* zz!Vy`i^(27CNv!iDZ*$5G{&;wJOnFSz{&5o+-TpRF_3_#wnfgrk?qpCGWG|Cyj zTqMqr3r2-ZnULe;yf!F{yuQ5#>W0%|J||xAwFR7wAm$$PAU+`j#21`Ltnu@%i<`V1 zQOOt2F$1^?3)T!!JH4P(Iq&mt4#MPUkxPmOlrR$X#RJVDW~k;G`88)^^pX(BqELkk zRLF;LaXFuC@g^Z6JfrkiSX_9}i}hyTPh=JDONgd&X%DhLo>twS-(md#v8pluGp zsZraj-3+uwfsz{0AEHjo%yLOBNRsX@d!^-L;>jGKWTCRU=1|MLGYzIBFAYWo1kff! zHACkf@@=<%x^6BU$)zCOxub9cuFj`nN(a)#1hC!|Rcc+#Bq8J7YORV|SDzj|^+x;A z!GQm3)GT%m$B9z)*6a$`VN?&psL1A^(#OZ|Aqn16apHNJ!1{-xnJGU=X7 jQ*?^EH5?%=jaW=Txe`Bi;P4VaACS9}DZ+$-jorm~=nl{m literal 0 HcmV?d00001 diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index f3e49864b..4dd3de6c6 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -22,7 +22,8 @@ ENV VARNISH_BACKEND_PORT "80" COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ - varnish + varnish \ + && /usr/local/bin/docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 109f18f82..778921412 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-install \ /var/log/supervisor \ && /opt/docker/bin/provision add --tag entrypoint webdevops-vsftp \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-vsftp \ - && /opt/docker/bin/bootstrap.sh - + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml index 2be18b0e0..4df3436ce 100644 --- a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ 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) + when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/provisioning/base/general/bin/provision b/provisioning/base/general/bin/provision index f7b5ad0a8..d367c2812 100755 --- a/provisioning/base/general/bin/provision +++ b/provisioning/base/general/bin/provision @@ -19,6 +19,7 @@ PLAYBOOK = Template( - hosts: all vars_files: + - ./variables-webdevops.yml - ./variables.yml roles: - $roles @@ -188,7 +189,7 @@ def actionAdd(args): 'priority': args.priority } - saveJson(json); + saveJson(json) diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml index 30be03c38..48a7a3abb 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -5,5 +5,4 @@ - include: bootstrap/root.yml - include: bootstrap/supervisor.yml - include: bootstrap/syslog-ng.yml -- include: bootstrap/logrotate.yml - include: bootstrap/pam.yml diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml deleted file mode 100644 index d87926be2..000000000 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/logrotate.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Configure logrotate running user - lineinfile: - dest: /etc/logrotate.conf - regexp: '^su [-_a-zA-Z0-9]+ [-_a-zA-Z0-9]+' - line: 'su root adm' - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* - -- name: Remove system logrotates (not needed) - file: - path: '{{ item }}' - state: absent - with_items: - # Debian/Ubuntu - - /etc/cron.daily/logrotate - - /etc/cron.daily/apt-compat - - /etc/cron.daily/dpkg - - /etc/cron.daily/passwd - # RedHat - - /etc/cron.daily/0yum-daily.cron - - /etc/cron.daily/logrotate - - /etc/cron.hourly/0yum-hourly.cron - # Alpine - - /etc/periodic/daily/logrotate diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml index 8dfbf9665..0741d7cae 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -14,3 +14,20 @@ dest: '/entrypoint.cmd' state: link force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/.gitkeep b/provisioning/base/general/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml deleted file mode 100644 index 10f7e6644..000000000 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/build/logrotate.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Register logrotate configurations - file: - src: '{{ item }}' - dest: '/etc/logrotate.d/{{ item | basename }}' - state: link - force: yes - with_fileglob: - - /opt/docker/etc/logrotate.d/* diff --git a/provisioning/base/general/provision/variables-webdevops.yml b/provisioning/base/general/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/provisioning/base/general/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/provisioning/base/general/provision/variables.yml b/provisioning/base/general/provision/variables.yml index ed97d539c..481ee218e 100644 --- a/provisioning/base/general/provision/variables.yml +++ b/provisioning/base/general/provision/variables.yml @@ -1 +1,7 @@ --- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index 1a3db9bac..dce03a1cc 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and ansible_lsb.major_release|int >= 7 + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 51945f90b..ec5083b95 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -41,3 +41,7 @@ ENTRYPOINT ["{{ command }}"] {%- macro cmd(command) -%} CMD ["{{ command }}"] {%- endmacro -%} + +{%- macro cleanup() -%} + && /usr/local/bin/docker-image-cleanup +{%- endmacro -%} diff --git a/template/Dockerfile/images/apache-dev.jinja2 b/template/Dockerfile/images/apache-dev.jinja2 index 31c788030..4b272d746 100644 --- a/template/Dockerfile/images/apache-dev.jinja2 +++ b/template/Dockerfile/images/apache-dev.jinja2 @@ -1,7 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} # Install apache RUN echo \ - {{ provision.runRoleInline('apache-dev', role) }} + {{ provision.runRoleInline('apache-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/apache.jinja2 b/template/Dockerfile/images/apache.jinja2 index c1dc03abf..4e2268ef4 100644 --- a/template/Dockerfile/images/apache.jinja2 +++ b/template/Dockerfile/images/apache.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -11,7 +12,8 @@ RUN /usr/local/bin/apk-install \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -24,7 +26,8 @@ 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 \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -40,7 +43,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian8(role='') -%} @@ -54,7 +58,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -68,7 +73,8 @@ RUN /usr/local/bin/apt-install \ ' /etc/apache2/apache2.conf \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -85,7 +91,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers version expires \ && mkdir -p /var/lock/apache2 \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -102,7 +109,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && a2enmod actions fastcgi ssl rewrite headers expires \ && mkdir -p /var/lock/apache2 \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -117,7 +125,8 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -132,5 +141,6 @@ RUN /usr/local/bin/apt-install \ && rm -f /etc/apache2/sites-enabled/* \ && ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ - {{ provision.runRoleInline('apache', role) }} + {{ provision.runRoleInline('apache', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 1700c1ebd..1c86582fc 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -6,13 +7,13 @@ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ sed \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -23,13 +24,13 @@ RUN chmod +x /opt/docker/bin/* \ cronie \ supervisor \ syslog-ng \ - logrotate \ wget \ curl \ net-tools \ gnupg2 \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -40,14 +41,14 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ net-tools \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -58,12 +59,12 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - logrotate \ cron \ wget \ curl \ net-tools \ gnupg \ && chmod +s /usr/local/bin/gosu \ - {{ provision.runRoleInline('base', role) }} + {{ provision.runRoleInline('base', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index 9779ffa3e..6eedc43d1 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -24,7 +25,8 @@ RUN /usr/local/bin/apk-install-edge shadow \ git \ nano \ vim \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -53,7 +55,8 @@ RUN /usr/local/bin/yum-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -82,7 +85,8 @@ RUN /usr/local/bin/apt-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian9(role='') -%} @@ -110,7 +114,8 @@ RUN /usr/local/bin/apt-install \ nano \ vim \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -139,5 +144,6 @@ RUN /usr/local/bin/apt-install \ vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ - {{ provision.runRoleInline('base-app', role) }} + {{ provision.runRoleInline('base-app', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 687adddc6..d735c6311 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -1,3 +1,5 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} + {% macro alpine() -%} # Init bootstrap (and install ansible) RUN set -x \ @@ -11,6 +13,7 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apk-install \ python \ @@ -47,7 +50,7 @@ RUN set -x \ && apk del .gosu-deps \ # Cleanup && apk del python-dev \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} @@ -72,6 +75,7 @@ RUN set -x \ libffi \ python-devel \ libffi-devel \ + && /usr/local/bin/generate-dockerimage-info \ && easy_install pip \ && pip install --upgrade pip \ && hash -r \ @@ -92,27 +96,27 @@ RUN set -x \ && yum erase -y wget \ # Cleanup && yum erase -y python-devel \ - && yum clean all \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(distribution) -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri 's/(deb.*\/debian {{ distribution }} main)/\1 contrib non-free /' -- /etc/apt/sources.list \ - # System updatei + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update && /usr/local/bin/apt-upgrade \ # Base stuff && /usr/local/bin/apt-install \ - lsb-release \ + apt-transport-https \ ca-certificates \ locales \ - apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -150,21 +154,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu12() -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ # Add multiverse && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -173,8 +175,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ + apt-transport-https \ python-software-properties \ - lsb-release \ ca-certificates \ # Install ansible python-minimal \ @@ -187,6 +189,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libssl-dev \ build-essential \ apt-transport-https \ + && /usr/local/bin/generate-dockerimage-info \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ @@ -210,16 +213,14 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu() -%} # Init bootstrap (and install ansible) -RUN export DEBIAN_FRONTEND=noninteractive \ - && set -x \ +RUN set -x \ + && apt-update \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # Generate base locale @@ -228,11 +229,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && /usr/local/bin/apt-upgrade \ # Install base stuff && /usr/local/bin/apt-install \ - software-properties-common \ - lsb-release \ ca-certificates \ apt-transport-https \ && apt-add-repository multiverse \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ # Install ansible && /usr/local/bin/apt-install \ python-minimal \ @@ -268,8 +269,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ build-essential \ libssl-dev \ libffi-dev \ - && apt-get autoremove -y -f \ - && apt-get clean -y \ - && find /var/log/ -mindepth 1 -delete + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/certbot.jinja2 b/template/Dockerfile/images/certbot.jinja2 index 350155d15..8c4b3eb75 100644 --- a/template/Dockerfile/images/certbot.jinja2 +++ b/template/Dockerfile/images/certbot.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro env() -%} diff --git a/template/Dockerfile/images/hhvm.jinja2 b/template/Dockerfile/images/hhvm.jinja2 index 6fd9bb196..38eac92d1 100644 --- a/template/Dockerfile/images/hhvm.jinja2 +++ b/template/Dockerfile/images/hhvm.jinja2 @@ -1,10 +1,11 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu14(role='') -%} # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \ + && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ @@ -12,7 +13,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ ghostscript \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('hhvm', role) }} + {{ provision.runRoleInline('hhvm', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -25,5 +27,6 @@ RUN /usr/local/bin/apt-install \ ghostscript \ && /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('hhvm', role) }} + {{ provision.runRoleInline('hhvm', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/liquibase.jinja2 b/template/Dockerfile/images/liquibase.jinja2 index 2940e88c8..50c2e7622 100644 --- a/template/Dockerfile/images/liquibase.jinja2 +++ b/template/Dockerfile/images/liquibase.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro mysql(role='') -%} diff --git a/template/Dockerfile/images/mail-sandbox.jinja2 b/template/Dockerfile/images/mail-sandbox.jinja2 index 62536f146..0393f04e3 100644 --- a/template/Dockerfile/images/mail-sandbox.jinja2 +++ b/template/Dockerfile/images/mail-sandbox.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} @@ -8,7 +9,8 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/control.sh service.enable dovecot \ && /opt/docker/bin/provision add --tag entrypoint webdevops-mail-sandbox \ - {{ provision.runRoleInline('mail-sandbox', role) }} + {{ provision.runRoleInline('mail-sandbox', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro roundcube(role='') -%} @@ -21,5 +23,6 @@ RUN cd /app \ && ls -l \ && rm -rf .git installer \ && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ - && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php + && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/nginx-dev.jinja2 b/template/Dockerfile/images/nginx-dev.jinja2 index 4c92aa67e..aed2d3400 100644 --- a/template/Dockerfile/images/nginx-dev.jinja2 +++ b/template/Dockerfile/images/nginx-dev.jinja2 @@ -1,7 +1,9 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} # Install apache RUN echo \ - {{ provision.runRoleInline('nginx-dev', role) }} + {{ provision.runRoleInline('nginx-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/nginx.jinja2 b/template/Dockerfile/images/nginx.jinja2 index 81e1b6956..a81c5cdbd 100644 --- a/template/Dockerfile/images/nginx.jinja2 +++ b/template/Dockerfile/images/nginx.jinja2 @@ -1,10 +1,12 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} # Install nginx RUN /usr/local/bin/apk-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -12,7 +14,8 @@ RUN /usr/local/bin/apk-install \ # Install tools RUN /usr/local/bin/yum-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -20,7 +23,8 @@ RUN /usr/local/bin/yum-install \ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -28,5 +32,6 @@ RUN /usr/local/bin/apt-install \ # Install nginx RUN /usr/local/bin/apt-install \ nginx \ - {{ provision.runRoleInline('nginx', role) }} + {{ provision.runRoleInline('nginx', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index ee3892e03..2f8f0bf89 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -7,7 +8,8 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -21,7 +23,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro webtatic(role='') -%} @@ -33,7 +36,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(role='') -%} @@ -47,7 +51,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -62,5 +67,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index e57c491dc..7dad0c04b 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -57,7 +58,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -103,8 +105,8 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro centosWebtatic(role='') -%} @@ -145,8 +147,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ - && yum clean all \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian7(role='') -%} @@ -180,7 +182,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -217,7 +220,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -253,7 +257,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu12(role='') -%} @@ -288,7 +293,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -325,7 +331,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu16(role='') -%} @@ -355,6 +362,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 index 7acf1dcb4..4be519031 100644 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ b/template/Dockerfile/images/php7-dev.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -7,7 +8,8 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} @@ -21,7 +23,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php7-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro webtatic(role='') -%} @@ -33,7 +36,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php70w-pecl-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian(role='') -%} @@ -47,7 +51,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianDotDeb(role='') -%} @@ -61,7 +66,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php7.0-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianSury(role='') -%} @@ -75,7 +81,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -89,5 +96,6 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ - {{ provision.runRoleInline('dev', 'php-dev', role) }} + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 index e1782e5f2..ec3f29198 100644 --- a/template/Dockerfile/images/php7.jinja2 +++ b/template/Dockerfile/images/php7.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine(role='') -%} @@ -62,7 +63,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianDotDeb(distribution,role='') -%} @@ -94,7 +96,8 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou php7.0-memcached \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debianSury(distribution,role='') -%} @@ -139,7 +142,8 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-mbstring \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro debian9(role='') -%} @@ -173,7 +177,8 @@ RUN /usr/local/bin/apt-install \ php-memcache \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro ubuntu(role='') -%} @@ -206,7 +211,8 @@ RUN /usr/local/bin/apt-install \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} {% macro centosWebtatic(role='') -%} @@ -254,5 +260,6 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && rm -rf /tmp/* \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ - {{ provision.runRoleInline('php', role) }} + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/postfix.jinja2 b/template/Dockerfile/images/postfix.jinja2 index 215afde6b..e5aa384f8 100644 --- a/template/Dockerfile/images/postfix.jinja2 +++ b/template/Dockerfile/images/postfix.jinja2 @@ -1,6 +1,8 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} RUN /opt/docker/bin/control.sh service.enable postfix \ - {{ provision.runRoleInline('postfix', role) }} + {{ provision.runRoleInline('postfix', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/samson-deployment.jinja2 b/template/Dockerfile/images/samson-deployment.jinja2 index 27f08bb37..87a4e8ade 100644 --- a/template/Dockerfile/images/samson-deployment.jinja2 +++ b/template/Dockerfile/images/samson-deployment.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro general(role='') -%} @@ -30,7 +31,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ python-dotenv \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ ## Enable ansible for deployment user - && chmod 755 /usr/local/bin/ansible* + && chmod 755 /usr/local/bin/ansible* \ + {{ docker.cleanup() }} # NPM stack RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ @@ -39,7 +41,8 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ && npm install -g gulp \ && npm install -g grunt-cli \ && npm install -g bower \ - && npm install -g npm-cache + && npm install -g npm-cache \ + {{ docker.cleanup() }} # Deployer stack RUN set -x \ @@ -60,7 +63,8 @@ RUN set -x \ && tar -xzf /tmp/magallanes.tar.gz -C /tmp/ \ && /tmp/magallanes/bin/mage install --installDir=/opt/magallanes \ && rm -rf /tmp/magallanes.tar.gz /tmp/magallanes/ \ - && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage + && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage \ + {{ docker.cleanup() }} # Upload ADD database.yml /app/config/database.yml diff --git a/template/Dockerfile/images/sphinx.jinja2 b/template/Dockerfile/images/sphinx.jinja2 index 318bb2e63..77944ab0a 100644 --- a/template/Dockerfile/images/sphinx.jinja2 +++ b/template/Dockerfile/images/sphinx.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro alpine() -%} @@ -20,5 +21,6 @@ RUN /usr/local/bin/apk-install \ && pip install t3SphinxThemeRtd \ && pip install t3fieldlisttable \ && pip install t3tablerows \ - && pip install t3targets + && pip install t3targets \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/ssh.jinja2 b/template/Dockerfile/images/ssh.jinja2 index 4f9b14256..ba5111b0a 100644 --- a/template/Dockerfile/images/ssh.jinja2 +++ b/template/Dockerfile/images/ssh.jinja2 @@ -1,5 +1,7 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu() -%} -RUN /opt/docker/bin/control.sh service.enable ssh +RUN /opt/docker/bin/control.sh service.enable ssh \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/typo3-solr.jinja2 b/template/Dockerfile/images/typo3-solr.jinja2 new file mode 100644 index 000000000..aab380f68 --- /dev/null +++ b/template/Dockerfile/images/typo3-solr.jinja2 @@ -0,0 +1,54 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/provision.jinja2' as provision %} + +{% macro guywithnose(release) -%} +USER root + +COPY ./solr/ /tmp/solr + +{{ docker.add('baselayout.tar', '/') }} + +WORKDIR / + +RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ + && /usr/local/bin/generate-dockerimage-info \ + && rm -rf /opt/solr/server \ + && mv /opt/solr/example/ /opt/solr/server/ \ + && rm -rf /opt/solr/server/solr \ + && mv /tmp/solr /opt/solr/server/solr \ + && mkdir -p /opt/solr/server/solr/typo3lib \ + && curl -sf -o /opt/solr/server/solr/typo3lib/solr-typo3-plugin.jar -L https://github.com/TYPO3-Solr/solr-typo3-plugin/releases/download/release-{{ release|replace(".", "_") }}/solr-typo3-plugin-{{ release }}.jar \ + && ln -s /opt/solr/contrib /opt/solr/server/solr/contrib \ + && mkdir -p /opt/solr/server/solr/data \ + && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ + && chown -R solr:solr /opt/solr/server/solr/ \ + {{ docker.cleanup() }} + +USER solr + +WORKDIR /opt/solr/server + +VOLUME ["/opt/solr/server/solr/data"] +{%- endmacro %} + + +{% macro official() -%} +USER root + +{{ docker.add('baselayout.tar', '/') }} + +COPY ./solr/ /tmp/solr + +RUN /usr/local/bin/apt-update \ + && /usr/local/bin/apt-install net-tools \ + && /usr/local/bin/generate-dockerimage-info \ + && rm -rf /opt/solr/server/solr \ + && mv /tmp/solr /opt/solr/server/solr \ + && mkdir -p /opt/solr/server/solr/data \ + && chown -R solr:solr /opt/solr/server/solr \ + {{ docker.cleanup() }} + +USER solr + +VOLUME ["/opt/solr/server/solr/data"] +{%- endmacro %} diff --git a/template/Dockerfile/images/varnish.jinja2 b/template/Dockerfile/images/varnish.jinja2 index 80ba54f4a..da59f81e2 100644 --- a/template/Dockerfile/images/varnish.jinja2 +++ b/template/Dockerfile/images/varnish.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro env() -%} @@ -14,5 +15,6 @@ ENV VARNISH_BACKEND_PORT "80" {% macro alpine() -%} RUN /usr/local/bin/apk-install \ - varnish + varnish \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/vsftp.jinja2 b/template/Dockerfile/images/vsftp.jinja2 index 56ae0a27e..fb2973b17 100644 --- a/template/Dockerfile/images/vsftp.jinja2 +++ b/template/Dockerfile/images/vsftp.jinja2 @@ -1,3 +1,4 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} @@ -9,5 +10,6 @@ RUN /usr/local/bin/apt-install \ /var/run/vsftpd/empty \ /var/log/supervisor \ {{ provision.registerRole('vsftp', entrypoint=True) }} \ - {{ provision.runRoleInline('vsftp', role) }} + {{ provision.runRoleInline('vsftp', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 8ab05431e..1ee166977 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -20,6 +20,7 @@ {% import 'Dockerfile/images/ssh.jinja2' as ssh %} {% import 'Dockerfile/images/vsftp.jinja2' as vsftp %} {% import 'Dockerfile/images/samson-deployment.jinja2' as samsonDeployment %} +{% import 'Dockerfile/images/typo3-solr.jinja2' as typo3Solr %} {% import 'Dockerfile/images/varnish.jinja2' as varnish %} {% import 'Dockerfile/images/certbot.jinja2' as certbot %} {% import 'Dockerfile/images/liquibase.jinja2' as liquibase %} diff --git a/template/Dockerfile/provision.jinja2 b/template/Dockerfile/provision.jinja2 index e777c9559..6a57f83db 100644 --- a/template/Dockerfile/provision.jinja2 +++ b/template/Dockerfile/provision.jinja2 @@ -3,8 +3,7 @@ {% if role %}--role webdevops-{{ role }} {% endif %} {%- endfor -%}{%- endfor -%} \{%- endif %} - && /opt/docker/bin/bootstrap.sh -{% endmacro %} + && /opt/docker/bin/bootstrap.sh{% endmacro %} {% macro registerRole(role='',bootstrap=False,build=False,onbuild=False,entrypoint=False) %}&& /opt/docker/bin/provision add {%if bootstrap%}--tag bootstrap {% endif %}{%if build%}--tag build {% endif %}{%if onbuild%}--tag onbuild {% endif %}{%if entrypoint%}--tag entrypoint {% endif %} webdevops-{{ role }}{% endmacro %} diff --git a/tests/serverspec/spec/shared/bootstrap/distribution.rb b/tests/serverspec/spec/shared/bootstrap/distribution.rb index 89f945f34..951508015 100644 --- a/tests/serverspec/spec/shared/bootstrap/distribution.rb +++ b/tests/serverspec/spec/shared/bootstrap/distribution.rb @@ -15,14 +15,14 @@ # Ubuntu ######################### - describe command('lsb_release -i | tr "\t" " " | tr -s " "'), :if => os[:family] == 'ubuntu' do - its(:stdout) { should contain('Distributor ID: Ubuntu') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain("Distributor ID:\tUbuntu") } its(:exit_status) { should eq 0 } end - describe command('lsb_release -r | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Release: ' + os[:version]) } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Release:\t" + os[:version]) } its(:exit_status) { should eq 0 } end @@ -31,15 +31,15 @@ # Debian ######################### - describe command('lsb_release -i | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Distributor ID: Debian') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Distributor ID:\tDebian") } its(:exit_status) { should eq 0 } end - describe command('lsb_release -r | tr "\t" " " | tr -s " "'), :if => os[:family] == 'debian' do - its(:stdout) { should contain('Release: ' + os[:version] + '.') } + describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Release:\t" + os[:version] + '.') } its(:exit_status) { should eq 0 } end From 32d11da09e3cff3af978bc28d59d000282ff1f54 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 27 Mar 2017 20:04:42 +0200 Subject: [PATCH 03/58] Move ansible to webdevops/base * Splitted ansible into own block * Added better cleanup --- baselayout/usr/local/bin/docker-image-cleanup | 1 + docker/ansible/alpine-3/Dockerfile | 22 ++++ docker/ansible/alpine-3/Dockerfile.jinja2 | 2 + docker/ansible/centos-7/Dockerfile | 22 ++++ docker/ansible/centos-7/Dockerfile.jinja2 | 2 + docker/ansible/debian-7/Dockerfile | 24 ++++ docker/ansible/debian-7/Dockerfile.jinja2 | 2 + docker/ansible/debian-8/Dockerfile | 24 ++++ docker/ansible/debian-8/Dockerfile.jinja2 | 2 + docker/ansible/debian-9/Dockerfile | 24 ++++ docker/ansible/debian-9/Dockerfile.jinja2 | 2 + docker/ansible/ubuntu-12.04/Dockerfile | 23 ++++ docker/ansible/ubuntu-12.04/Dockerfile.jinja2 | 2 + docker/ansible/ubuntu-14.04/Dockerfile | 23 ++++ docker/ansible/ubuntu-14.04/Dockerfile.jinja2 | 2 + docker/ansible/ubuntu-15.04/Dockerfile | 23 ++++ docker/ansible/ubuntu-15.04/Dockerfile.jinja2 | 2 + docker/ansible/ubuntu-15.10/Dockerfile | 23 ++++ docker/ansible/ubuntu-15.10/Dockerfile.jinja2 | 2 + docker/ansible/ubuntu-16.04/Dockerfile | 23 ++++ docker/ansible/ubuntu-16.04/Dockerfile.jinja2 | 2 + docker/base/alpine-3/Dockerfile | 22 ++++ docker/base/alpine-3/Dockerfile.jinja2 | 2 + docker/base/centos-7/Dockerfile | 22 ++++ docker/base/centos-7/Dockerfile.jinja2 | 2 + docker/base/debian-7/Dockerfile | 24 ++++ docker/base/debian-7/Dockerfile.jinja2 | 2 + docker/base/debian-8/Dockerfile | 24 ++++ docker/base/debian-8/Dockerfile.jinja2 | 2 + docker/base/debian-9/Dockerfile | 24 ++++ docker/base/debian-9/Dockerfile.jinja2 | 2 + docker/base/ubuntu-12.04/Dockerfile | 23 ++++ docker/base/ubuntu-12.04/Dockerfile.jinja2 | 2 + docker/base/ubuntu-14.04/Dockerfile | 23 ++++ docker/base/ubuntu-14.04/Dockerfile.jinja2 | 2 + docker/base/ubuntu-15.04/Dockerfile | 23 ++++ docker/base/ubuntu-15.04/Dockerfile.jinja2 | 2 + docker/base/ubuntu-15.10/Dockerfile | 23 ++++ docker/base/ubuntu-15.10/Dockerfile.jinja2 | 2 + docker/base/ubuntu-16.04/Dockerfile | 23 ++++ docker/base/ubuntu-16.04/Dockerfile.jinja2 | 2 + docker/base/ubuntu-16.10/Dockerfile | 23 ++++ docker/base/ubuntu-16.10/Dockerfile.jinja2 | 2 + docker/bootstrap/alpine-3/Dockerfile | 20 ---- docker/bootstrap/alpine-3/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/centos-7/Dockerfile | 17 --- docker/bootstrap/centos-7/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/debian-7/Dockerfile | 21 ---- docker/bootstrap/debian-7/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/debian-8/Dockerfile | 21 ---- docker/bootstrap/debian-8/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/debian-9/Dockerfile | 21 ---- docker/bootstrap/debian-9/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-12.04/Dockerfile | 20 ---- docker/bootstrap/ubuntu-12.04/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-14.04/Dockerfile | 22 ---- docker/bootstrap/ubuntu-14.04/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-15.04/Dockerfile | 22 ---- docker/bootstrap/ubuntu-15.04/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-15.10/Dockerfile | 22 ---- docker/bootstrap/ubuntu-15.10/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-16.04/Dockerfile | 22 ---- docker/bootstrap/ubuntu-16.04/baselayout.tar | Bin 9593 -> 9601 bytes docker/bootstrap/ubuntu-16.10/Dockerfile | 22 ---- docker/bootstrap/ubuntu-16.10/baselayout.tar | Bin 9593 -> 9601 bytes docker/samson-deployment/latest/Dockerfile | 21 ---- .../samson-deployment/latest/baselayout.tar | Bin 9593 -> 9601 bytes docker/typo3-solr/3.1/baselayout.tar | Bin 9593 -> 9601 bytes docker/typo3-solr/5.0/baselayout.tar | Bin 9593 -> 9601 bytes docker/typo3-solr/6.0/baselayout.tar | Bin 9593 -> 9601 bytes template/Dockerfile/images/ansible.jinja2 | 104 ++++++++++++++++++ template/Dockerfile/images/bootstrap.jinja2 | 100 ----------------- template/Dockerfile/layout.jinja2 | 1 + 73 files changed, 633 insertions(+), 351 deletions(-) create mode 100644 template/Dockerfile/images/ansible.jinja2 diff --git a/baselayout/usr/local/bin/docker-image-cleanup b/baselayout/usr/local/bin/docker-image-cleanup index ef3c3ca9b..97682c762 100755 --- a/baselayout/usr/local/bin/docker-image-cleanup +++ b/baselayout/usr/local/bin/docker-image-cleanup @@ -33,3 +33,4 @@ case "$LSB_FAMILY" in esac find /tmp/ /var/log/ -mindepth 1 -delete +rm -rf /root/.cache diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index 548242cbe..cdc37b767 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -9,3 +9,25 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && apk del python-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/alpine-3/Dockerfile.jinja2 b/docker/ansible/alpine-3/Dockerfile.jinja2 index fa7d167f0..4775e9f6c 100644 --- a/docker/ansible/alpine-3/Dockerfile.jinja2 +++ b/docker/ansible/alpine-3/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "alpine-3") }} {{ docker.version() }} + +{{ ansible.alpine() }} diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 6cd2e4586..23f664a82 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -9,3 +9,25 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel \ + && easy_install pip \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && yum erase -y python-devel \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 index df6600e50..fb34b1c41 100644 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ b/docker/ansible/centos-7/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "centos-7") }} {{ docker.version() }} + +{{ ansible.centos() }} diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 0ccdb3387..5b9deff11 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -9,3 +9,27 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 index d4f9bd541..9c9a1779d 100644 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ b/docker/ansible/debian-7/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "debian-7") }} {{ docker.version() }} + +{{ ansible.debian() }} diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 8d479d45a..b01ba98e0 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -9,3 +9,27 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 index db21f396f..55d4daad4 100644 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ b/docker/ansible/debian-8/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "debian-8") }} {{ docker.version() }} + +{{ ansible.debian() }} diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index a003af70b..cca61009f 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -9,3 +9,27 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 index 421b2acff..d3a2467a9 100644 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ b/docker/ansible/debian-9/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "debian-9") }} {{ docker.version() }} + +{{ ansible.debian() }} diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index a76342092..0cb6aabee 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -9,3 +9,26 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 index 12c464c01..507258194 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-12.04") }} {{ docker.version() }} + +{{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 4a2bf36fc..a98457aee 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -9,3 +9,26 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 index 9b61a0b6d..1671a2ab3 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-14.04") }} {{ docker.version() }} + +{{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index ae02cf0c7..8fac4e8c3 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -9,3 +9,26 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 index 2feaab03a..51de32a4c 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-15.04") }} {{ docker.version() }} + +{{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index 19e2f5aaf..dcf6eb367 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -9,3 +9,26 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 index f8df16c71..3fac77507 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-15.10") }} {{ docker.version() }} + +{{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 3122de821..894169e1e 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -9,3 +9,26 @@ MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 + +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 index 3c1a9b9c0..a141abcb3 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 @@ -1,3 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-16.04") }} {{ docker.version() }} + +{{ ansible.ubuntu() }} diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 3b9f33992..a10256a68 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -14,6 +14,28 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && apk del python-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ diff --git a/docker/base/alpine-3/Dockerfile.jinja2 b/docker/base/alpine-3/Dockerfile.jinja2 index 09a16ecd4..969ab8227 100644 --- a/docker/base/alpine-3/Dockerfile.jinja2 +++ b/docker/base/alpine-3/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.alpine() }} + {{ base.alpine() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index ea9a88438..1fa842980 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -14,6 +14,28 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel \ + && easy_install pip \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && yum erase -y python-devel \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index 04251e84a..1034884ad 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.centos() }} + {{ base.centos() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index dfdcd4a6b..68af0fdbf 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -14,6 +14,30 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index 0712c0d90..be61e2751 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.debian() }} + {{ base.debian() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 2b5fff13f..7a884be45 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -14,6 +14,30 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index b8e1602cf..a25904508 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.debian() }} + {{ base.debian() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 60ef8fb41..ac7e7c436 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -14,6 +14,30 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index d43d021d2..c25543988 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.debian() }} + {{ base.debian() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 047b345c1..210617fac 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index 765843d39..32cd791fd 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 5a9a7f185..4e19ed078 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index 88a50dc97..83ef8a28f 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index b033bea58..3d626bee1 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index 076c9fe10..aa9c4097c 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index cbda949c0..a6274fd91 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index e6c13ab5e..a465f3f3f 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 53eee2dbe..d2c70208b 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index b96158a0a..fd5fb7ce9 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index bfa7158cf..9e5a48b57 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -14,6 +14,29 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index 4d48146b0..347f59c3e 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -6,6 +6,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.ubuntu() }} + {{ base.ubuntu() }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 5377c10bc..6745f1cd0 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -29,24 +29,6 @@ RUN set -x \ bash \ ca-certificates \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && apk add --no-cache --virtual .gosu-deps \ @@ -63,6 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apk del .gosu-deps \ - # Cleanup - && apk del python-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index c84dff97d..503effa9a 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -25,22 +25,7 @@ RUN set -x \ # Install ansible && /usr/local/bin/yum-install \ epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel \ && /usr/local/bin/generate-dockerimage-info \ - && easy_install pip \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/yum-install gpg wget \ @@ -54,6 +39,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && yum erase -y wget \ - # Cleanup - && yum erase -y python-devel \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 677df3450..edb0f8eb9 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -35,21 +35,6 @@ RUN set -x \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && /usr/local/bin/apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -63,10 +48,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget dirmngr \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 8c20becfe..f26f461be 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -35,21 +35,6 @@ RUN set -x \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && /usr/local/bin/apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -63,10 +48,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget dirmngr \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 4b193173e..ac1506a77 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -35,21 +35,6 @@ RUN set -x \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && /usr/local/bin/apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -63,10 +48,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget dirmngr \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index aaa87307d..00fa524fb 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -35,22 +35,8 @@ RUN set -x \ apt-transport-https \ python-software-properties \ ca-certificates \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ apt-transport-https \ && /usr/local/bin/generate-dockerimage-info \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -64,10 +50,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 66608ddbd..3df29b5d0 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -32,22 +32,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -61,10 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index cee479bbb..4c0cfef50 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -32,22 +32,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -61,10 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 4675cbf80..dedeb4c7c 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -32,22 +32,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -61,10 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index f24310c1c..ff3ce5339 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -32,22 +32,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -61,10 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index f653acd08..48c8925cb 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -32,22 +32,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -61,10 +45,4 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/baselayout.tar b/docker/bootstrap/ubuntu-16.10/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 019ecd062..0df0e828d 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -40,21 +40,6 @@ RUN set -x \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && /usr/local/bin/apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -68,12 +53,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget dirmngr \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ && /usr/local/bin/docker-image-cleanup ############################################################################### diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/typo3-solr/3.1/baselayout.tar b/docker/typo3-solr/3.1/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/typo3-solr/5.0/baselayout.tar b/docker/typo3-solr/5.0/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/docker/typo3-solr/6.0/baselayout.tar b/docker/typo3-solr/6.0/baselayout.tar index dcac04c19eae2ca0aa4fea75a77ccb6572a95616..68905af7cf1a630e80bb2ca12671b637419715c9 100644 GIT binary patch literal 9601 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 diff --git a/template/Dockerfile/images/ansible.jinja2 b/template/Dockerfile/images/ansible.jinja2 new file mode 100644 index 000000000..99f16ed36 --- /dev/null +++ b/template/Dockerfile/images/ansible.jinja2 @@ -0,0 +1,104 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} + +{% macro alpine() -%} +# Install ansible +RUN /usr/local/bin/apk-install \ + python \ + python-dev \ + py-setuptools \ + py-crypto \ + py2-pip \ + py-cparser \ + py-cryptography \ + py-markupsafe \ + py-cffi \ + py-yaml \ + py-jinja2 \ + py-paramiko \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && apk del python-dev \ + {{ docker.cleanup() }} +{%- endmacro %} + + +{% macro centos() -%} +# Install ansible +RUN /usr/local/bin/yum-install \ + epel-release \ + PyYAML \ + python-jinja2 \ + python-httplib2 \ + python-keyczar \ + python-paramiko \ + python-setuptools \ + python-setuptools-devel \ + libffi \ + python-devel \ + libffi-devel \ + && easy_install pip \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/bin/ansible* \ + # Cleanup + && yum erase -y python-devel \ + {{ docker.cleanup() }} +{%- endmacro %} + + +{% macro debian(distribution) -%} +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + {{ docker.cleanup() }} +{%- endmacro %} + + +{% macro ubuntu() -%} +# Install ansible +RUN /usr/local/bin/apt-install \ + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + {{ docker.cleanup() }} +{%- endmacro %} + diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index d735c6311..1e80720c4 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -14,24 +14,6 @@ RUN set -x \ bash \ ca-certificates \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apk-install \ - python \ - python-dev \ - py-setuptools \ - py-crypto \ - py2-pip \ - py-cparser \ - py-cryptography \ - py-markupsafe \ - py-cffi \ - py-yaml \ - py-jinja2 \ - py-paramiko \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && apk add --no-cache --virtual .gosu-deps \ @@ -48,8 +30,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apk del .gosu-deps \ - # Cleanup - && apk del python-dev \ {{ docker.cleanup() }} {%- endmacro %} @@ -65,22 +45,7 @@ RUN set -x \ # Install ansible && /usr/local/bin/yum-install \ epel-release \ - PyYAML \ - python-jinja2 \ - python-httplib2 \ - python-keyczar \ - python-paramiko \ - python-setuptools \ - python-setuptools-devel \ - libffi \ - python-devel \ - libffi-devel \ && /usr/local/bin/generate-dockerimage-info \ - && easy_install pip \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/yum-install gpg wget \ @@ -94,8 +59,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && yum erase -y wget \ - # Cleanup - && yum erase -y python-devel \ {{ docker.cleanup() }} {%- endmacro %} @@ -120,21 +83,6 @@ RUN set -x \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && /usr/local/bin/apt-install \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -148,12 +96,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget dirmngr \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ {{ docker.cleanup() }} {%- endmacro %} @@ -178,22 +120,8 @@ RUN set -x \ apt-transport-https \ python-software-properties \ ca-certificates \ - # Install ansible - python-minimal \ - python-setuptools \ - python-pip \ - python-paramiko \ - python-jinja2 \ - python-dev \ - libffi-dev \ - libssl-dev \ - build-essential \ apt-transport-https \ && /usr/local/bin/generate-dockerimage-info \ - && pip install --upgrade pip \ - && hash -r \ - && pip install ansible \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -207,12 +135,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ {{ docker.cleanup() }} {%- endmacro %} @@ -234,22 +156,6 @@ RUN set -x \ && apt-add-repository multiverse \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ - # Install ansible - && /usr/local/bin/apt-install \ - python-minimal \ - python-setuptools \ - 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 \ - && chmod 750 /usr/local/bin/ansible* \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg \ @@ -263,12 +169,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apt-get purge -y -f --force-yes wget \ - # Cleanup - && apt-get purge -y -f --force-yes \ - python-dev \ - build-essential \ - libssl-dev \ - libffi-dev \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 1ee166977..9b12c06d3 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -2,6 +2,7 @@ {% import 'Dockerfile/provision.jinja2' as provision %} {% import 'Dockerfile/environment.jinja2' as environment %} +{% import 'Dockerfile/images/ansible.jinja2' as ansible %} {% import 'Dockerfile/images/bootstrap.jinja2' as bootstrap %} {% import 'Dockerfile/images/base.jinja2' as base %} {% import 'Dockerfile/images/baseapp.jinja2' as baseapp %} From 7c5874ca81e1cb77244ec66b38973fc399e95b0d Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 27 Mar 2017 20:12:06 +0200 Subject: [PATCH 04/58] Improve apache and nginx logging and settings * Moved nginx logging conf to nginx/vhost.common.d/10-log.conf * Set nginx logging level to warn * Moved nginx general vhost settings to nginx/vhost.common.d/10-settings.conf * Set apache logging to /docker.stdout and /docker.stderr --- .../apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../apache/centos-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../apache/debian-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../apache/debian-8/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../apache/debian-9/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 10 ---------- .../alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../centos-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../debian-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../debian-8/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../debian-9/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/alpine-3/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../centos-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/centos-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/debian-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-8/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/debian-8/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-9/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/debian-9/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf | 10 ---------- .../alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../alpine-3/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7-php56/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-8-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-8/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-9/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../alpine-3/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7-php56/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../centos-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-8-php7/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-8/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../debian-9/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf | 4 ++-- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../alpine-3-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../centos-7-php56/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../centos-7-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../centos-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../debian-8-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-8/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-9/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-12.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-14.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-15.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-15.10/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-16.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../ubuntu-16.10/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../centos-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-7/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-8/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../debian-9/conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 10 ---------- .../conf/etc/nginx/vhost.common.d/10-general.conf | 1 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf | 10 ---------- .../apache/general/etc/httpd/conf.d/10-log.conf | 4 ++-- .../general/etc/nginx/vhost.common.d/10-log.conf | 2 ++ .../general/etc/nginx/vhost.common.d/10-general.conf | 1 + .../nginx/general/etc/nginx/vhost.common.d/10-log.conf | 2 ++ provisioning/nginx/general/etc/nginx/vhost.conf | 10 ---------- 188 files changed, 244 insertions(+), 528 deletions(-) create mode 100644 docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 provisioning/nginx-dev/general/etc/nginx/vhost.common.d/10-log.conf create mode 100644 provisioning/nginx/general/etc/nginx/vhost.common.d/10-general.conf create mode 100644 provisioning/nginx/general/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/hhvm-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/hhvm-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/hhvm-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/hhvm-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/nginx/centos-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-8/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-9/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr 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 index e4c4be4f2..ef0c73d38 100644 --- 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 @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/centos-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/debian-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/debian-8/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/debian-9/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache-dev/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr 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 index e4c4be4f2..ef0c73d38 100644 --- 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 @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/centos-7-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/centos-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/debian-7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/debian-8-php7/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/debian-8/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/debian-9/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-14.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-15.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-15.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-16.04/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf +++ b/docker/php-apache/ubuntu-16.10/conf/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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.common.d/10-general.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; 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 index d07e27094..03315d1c5 100644 --- 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 @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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.common.d/10-general.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; 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 index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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/provisioning/apache/general/etc/httpd/conf.d/10-log.conf b/provisioning/apache/general/etc/httpd/conf.d/10-log.conf index e4c4be4f2..ef0c73d38 100644 --- a/provisioning/apache/general/etc/httpd/conf.d/10-log.conf +++ b/provisioning/apache/general/etc/httpd/conf.d/10-log.conf @@ -1,4 +1,4 @@ LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog LogLevel warn -CustomLog /proc/self/fd/1 dockerlog -ErrorLog /proc/self/fd/2 +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/10-log.conf b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/provisioning/nginx/general/etc/nginx/vhost.common.d/10-general.conf b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/provisioning/nginx/general/etc/nginx/vhost.common.d/10-log.conf b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/provisioning/nginx/general/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/provisioning/nginx/general/etc/nginx/vhost.conf b/provisioning/nginx/general/etc/nginx/vhost.conf index d07e27094..03315d1c5 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.conf @@ -4,14 +4,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.stdout info; - root ""; index ; - client_max_body_size 50m; - include /opt/docker/etc/nginx/vhost.common.d/*.conf; } @@ -25,14 +20,9 @@ server { server_name _ docker; - access_log /docker.stdout; - error_log /docker.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; } From 065056fe9a611b6b21da031520b5b2392b066333 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 27 Mar 2017 20:14:23 +0200 Subject: [PATCH 05/58] Remove superfluous nginx ports * Removed 8000 and 8443 (not exposed) --- docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/alpine-3/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/centos-7/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/debian-7/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/debian-8/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/debian-9/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf | 6 ++---- .../php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf | 6 ++---- .../php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.conf | 6 ++---- .../php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf | 6 ++---- .../php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf | 6 ++---- docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf | 6 ++---- provisioning/nginx/general/etc/nginx/vhost.conf | 6 ++---- 44 files changed, 88 insertions(+), 176 deletions(-) diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/nginx/centos-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/nginx/centos-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/nginx/debian-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/nginx/debian-8/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-8/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/nginx/debian-9/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/nginx/debian-9/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; 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 index 03315d1c5..8225f314a 100644 --- 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 @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/centos-7-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; 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 index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7-php56/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/centos-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-8-php7/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-8/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/debian-9/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-12.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-14.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-15.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-15.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-16.04/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/ubuntu-16.10/conf/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; diff --git a/provisioning/nginx/general/etc/nginx/vhost.conf b/provisioning/nginx/general/etc/nginx/vhost.conf index 03315d1c5..8225f314a 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.conf @@ -1,6 +1,5 @@ server { - listen 80 default_server; - listen 8000 default_server; + listen 80 default_server; server_name _ docker; @@ -15,8 +14,7 @@ server { ############## server { - listen 443 default_server; - listen 8443 default_server; + listen 443 default_server; server_name _ docker; From 0c685744b51ff6f45b6118924128f595cd8a96f5 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 28 Mar 2017 21:56:06 +0200 Subject: [PATCH 06/58] Fix tests and build issues * Readd python for rpl * Fix tests --- docker/base/alpine-3/Dockerfile | 1 + docker/base/centos-7/Dockerfile | 1 + docker/base/debian-7/Dockerfile | 1 + docker/base/debian-8/Dockerfile | 1 + docker/base/debian-9/Dockerfile | 1 + docker/base/ubuntu-12.04/Dockerfile | 1 + docker/base/ubuntu-14.04/Dockerfile | 1 + docker/base/ubuntu-15.04/Dockerfile | 1 + docker/base/ubuntu-15.10/Dockerfile | 1 + docker/base/ubuntu-16.04/Dockerfile | 1 + docker/base/ubuntu-16.10/Dockerfile | 1 + docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 3 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 2 +- docker/certbot/latest/Dockerfile | 8 +- docker/samson-deployment/latest/Dockerfile | 27 +++++- .../latest/Dockerfile.jinja2 | 2 + docker/sphinx/latest/Dockerfile | 6 ++ template/Dockerfile/images/base.jinja2 | 4 + template/Dockerfile/images/bootstrap.jinja2 | 11 +-- template/Dockerfile/images/certbot.jinja2 | 8 +- template/Dockerfile/images/sphinx.jinja2 | 6 ++ tests/serverspec/spec/collection/ansible.rb | 4 + tests/serverspec/spec/collection/base.rb | 2 + tests/serverspec/spec/collection/bootstrap.rb | 2 - tests/serverspec/spec/collection/certbot.rb | 2 + .../spec/collection/samson-deployment.rb | 3 + tests/serverspec/spec/docker/ansible_spec.rb | 1 + .../spec/docker/samson-deployment_spec.rb | 1 - .../spec/shared/ansible/toolchain.rb | 95 +++++++++++++++++++ .../serverspec/spec/shared/base/toolchain.rb | 5 + .../spec/shared/bootstrap/ansible.rb | 47 --------- .../shared/{bootstrap => python}/toolchain.rb | 6 +- 41 files changed, 198 insertions(+), 76 deletions(-) create mode 100644 tests/serverspec/spec/collection/ansible.rb create mode 100644 tests/serverspec/spec/shared/ansible/toolchain.rb create mode 100644 tests/serverspec/spec/shared/base/toolchain.rb delete mode 100644 tests/serverspec/spec/shared/bootstrap/ansible.rb rename tests/serverspec/spec/shared/{bootstrap => python}/toolchain.rb (78%) diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index a10256a68..7d0c12ba3 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -39,6 +39,7 @@ RUN /usr/local/bin/apk-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ + python \ supervisor \ syslog-ng \ wget \ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 1fa842980..b1c091682 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -39,6 +39,7 @@ RUN /usr/local/bin/yum-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ + python \ cronie \ supervisor \ syslog-ng \ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 68af0fdbf..cca885e5e 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 7a884be45..c913343ea 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index ac7e7c436..29b520b4d 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -41,6 +41,7 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 210617fac..becfd1dcb 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 4e19ed078..d43bfb220 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 3d626bee1..18dc1bc6b 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index a6274fd91..084bde5f6 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index d2c70208b..b75881394 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 9e5a48b57..78b78a952 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 6745f1cd0..6cadb9f48 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 503effa9a..c98a3767e 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -16,13 +16,12 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # System update && /usr/local/bin/yum-upgrade \ - # Install ansible && /usr/local/bin/yum-install \ epel-release \ && /usr/local/bin/generate-dockerimage-info \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index edb0f8eb9..8a6247326 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index f26f461be..5f0fc950c 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index ac1506a77..f42c666da 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 00fa524fb..0e5c4f113 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Add multiverse && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 3df29b5d0..a78eb0fac 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4c0cfef50..e53c2ffbe 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index dedeb4c7c..5afe38127 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ff3ce5339..95c283fa5 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 48c8925cb..5b14ba41f 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -16,7 +16,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index eeb65a7b6..cffb503c2 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -14,5 +14,11 @@ VOLUME /etc/letsencrypt VOLUME /var/www RUN /usr/local/bin/apk-install \ + python \ + py-crypto \ + py2-pip \ certbot \ - && pip install pyRFC3339 configobj ConfigArgParse + && pip install --upgrade pip \ + && hash -r \ + && pip install pyRFC3339 configobj ConfigArgParse \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 0df0e828d..338808d51 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -21,7 +21,7 @@ ENV LC_ALL "en_US.UTF-8" ADD baselayout.tar / -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ @@ -63,9 +63,34 @@ ENV DOCKER_CONF_HOME /opt/docker/ COPY conf/ /opt/docker/ +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index 8edbd4da0..fce6e0fc0 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -21,6 +21,8 @@ {{ docker.copy('conf/', '/opt/docker/') }} +{{ ansible.debian() }} + {{ base.debian() }} ############################################################################### diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index c402c2d24..fc428a658 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -11,6 +11,10 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 RUN /usr/local/bin/apk-install \ + # General python + python \ + py-crypto \ + py2-pip \ # General sphinx py-pillow \ py-yaml \ @@ -19,6 +23,8 @@ RUN /usr/local/bin/apk-install \ # GRAPHVIZ graphviz \ ttf-dejavu \ + && pip install --upgrade pip \ + && hash -r \ && pip install --upgrade sphinxcontrib-googlechart \ && pip install --upgrade sphinxcontrib-googlemaps \ && pip install --upgrade sphinxcontrib-httpdomain \ diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 1c86582fc..21ac56777 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -5,6 +5,7 @@ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ + python \ supervisor \ syslog-ng \ wget \ @@ -21,6 +22,7 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ + python \ cronie \ supervisor \ syslog-ng \ @@ -38,6 +40,7 @@ RUN chmod +x /opt/docker/bin/* \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ @@ -56,6 +59,7 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ + python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 1e80720c4..182bde062 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -1,7 +1,7 @@ {% import 'Dockerfile/docker.jinja2' as docker %} {% macro alpine() -%} -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ @@ -36,13 +36,12 @@ RUN set -x \ {% macro centos() -%} -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ # System update && /usr/local/bin/yum-upgrade \ - # Install ansible && /usr/local/bin/yum-install \ epel-release \ && /usr/local/bin/generate-dockerimage-info \ @@ -64,7 +63,7 @@ RUN set -x \ {% macro debian(distribution) -%} -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Fix root terminal && echo "export TERM=xterm" >> /root/.bashrc \ @@ -101,7 +100,7 @@ RUN set -x \ {% macro ubuntu12() -%} -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ # Add multiverse && echo "deb http://archive.ubuntu.com/ubuntu/ precise-security multiverse" >> /etc/apt/sources.list \ @@ -140,7 +139,7 @@ RUN set -x \ {% macro ubuntu() -%} -# Init bootstrap (and install ansible) +# Init bootstrap RUN set -x \ && apt-update \ # Fix root terminal diff --git a/template/Dockerfile/images/certbot.jinja2 b/template/Dockerfile/images/certbot.jinja2 index 8c4b3eb75..484fd02e3 100644 --- a/template/Dockerfile/images/certbot.jinja2 +++ b/template/Dockerfile/images/certbot.jinja2 @@ -8,6 +8,12 @@ ENV CERTBOT_DOMAIN "" {% macro alpine() -%} RUN /usr/local/bin/apk-install \ + python \ + py-crypto \ + py2-pip \ certbot \ - && pip install pyRFC3339 configobj ConfigArgParse + && pip install --upgrade pip \ + && hash -r \ + && pip install pyRFC3339 configobj ConfigArgParse \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/sphinx.jinja2 b/template/Dockerfile/images/sphinx.jinja2 index 77944ab0a..499338408 100644 --- a/template/Dockerfile/images/sphinx.jinja2 +++ b/template/Dockerfile/images/sphinx.jinja2 @@ -3,6 +3,10 @@ {% macro alpine() -%} RUN /usr/local/bin/apk-install \ + # General python + python \ + py-crypto \ + py2-pip \ # General sphinx py-pillow \ py-yaml \ @@ -11,6 +15,8 @@ RUN /usr/local/bin/apk-install \ # GRAPHVIZ graphviz \ ttf-dejavu \ + && pip install --upgrade pip \ + && hash -r \ && pip install --upgrade sphinxcontrib-googlechart \ && pip install --upgrade sphinxcontrib-googlemaps \ && pip install --upgrade sphinxcontrib-httpdomain \ diff --git a/tests/serverspec/spec/collection/ansible.rb b/tests/serverspec/spec/collection/ansible.rb new file mode 100644 index 000000000..f170ecc69 --- /dev/null +++ b/tests/serverspec/spec/collection/ansible.rb @@ -0,0 +1,4 @@ +shared_examples 'collection::ansible' do + include_examples 'python::toolchain' + include_examples 'ansible::toolchain' +end diff --git a/tests/serverspec/spec/collection/base.rb b/tests/serverspec/spec/collection/base.rb index fe0616f7e..c7fa05296 100644 --- a/tests/serverspec/spec/collection/base.rb +++ b/tests/serverspec/spec/collection/base.rb @@ -3,4 +3,6 @@ include_examples 'base::packages' include_examples 'base::supervisor' include_examples 'base::syslog-ng' + include_examples 'base::toolchain' + include_examples 'ansible::toolchain' end diff --git a/tests/serverspec/spec/collection/bootstrap.rb b/tests/serverspec/spec/collection/bootstrap.rb index de5615584..8b6423ff4 100644 --- a/tests/serverspec/spec/collection/bootstrap.rb +++ b/tests/serverspec/spec/collection/bootstrap.rb @@ -1,8 +1,6 @@ shared_examples 'collection::bootstrap' do include_examples 'bootstrap::layout' include_examples 'bootstrap::distribution' - include_examples 'bootstrap::toolchain' - include_examples 'bootstrap::ansible' if (os[:family] == 'alpine') include_examples 'vendor::alpine::apk' diff --git a/tests/serverspec/spec/collection/certbot.rb b/tests/serverspec/spec/collection/certbot.rb index 766d45761..79de26a2d 100644 --- a/tests/serverspec/spec/collection/certbot.rb +++ b/tests/serverspec/spec/collection/certbot.rb @@ -1,4 +1,6 @@ shared_examples 'collection::certbot' do + include_examples 'python::toolchain' + include_examples 'misc::letsencrypt' include_examples 'certbot::layout' end diff --git a/tests/serverspec/spec/collection/samson-deployment.rb b/tests/serverspec/spec/collection/samson-deployment.rb index 47b75ea75..e17f2ccbe 100644 --- a/tests/serverspec/spec/collection/samson-deployment.rb +++ b/tests/serverspec/spec/collection/samson-deployment.rb @@ -1,4 +1,7 @@ shared_examples 'collection::samson-deployment' do + include_examples 'python::toolchain' + include_examples 'ansible::toolchain::public' + include_examples 'samson-deployment::layout' include_examples 'samson-deployment::deployment' diff --git a/tests/serverspec/spec/docker/ansible_spec.rb b/tests/serverspec/spec/docker/ansible_spec.rb index fcf450086..6624cc1d7 100644 --- a/tests/serverspec/spec/docker/ansible_spec.rb +++ b/tests/serverspec/spec/docker/ansible_spec.rb @@ -8,5 +8,6 @@ end include_examples 'collection::bootstrap' + include_examples 'collection::ansible' end diff --git a/tests/serverspec/spec/docker/samson-deployment_spec.rb b/tests/serverspec/spec/docker/samson-deployment_spec.rb index 943ece68d..9ec7cc44d 100644 --- a/tests/serverspec/spec/docker/samson-deployment_spec.rb +++ b/tests/serverspec/spec/docker/samson-deployment_spec.rb @@ -9,7 +9,6 @@ include_examples 'bootstrap::layout' include_examples 'bootstrap::distribution' - include_examples 'bootstrap::toolchain' include_examples 'collection::base-app' include_examples 'collection::samson-deployment::php' diff --git a/tests/serverspec/spec/shared/ansible/toolchain.rb b/tests/serverspec/spec/shared/ansible/toolchain.rb new file mode 100644 index 000000000..0d365fd76 --- /dev/null +++ b/tests/serverspec/spec/shared/ansible/toolchain.rb @@ -0,0 +1,95 @@ +shared_examples 'ansible::toolchain' do + + ansibleList = [ + $testConfiguration[:ansiblePath] + "/ansible", + $testConfiguration[:ansiblePath] + "/ansible-playbook", + $testConfiguration[:ansiblePath] + "/ansible-galaxy", + $testConfiguration[:ansiblePath] + "/ansible-pull", + $testConfiguration[:ansiblePath] + "/ansible-doc", + $testConfiguration[:ansiblePath] + "/ansible-vault", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should_not be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should_not be_executable.by('others') } + end + end + + describe command('ansible --version') do + its(:stdout) { should match $packageVersions[:ansible] } + + its(:exit_status) { should eq 0 } + end + + describe command('ansible-playbook --version') do + its(:stdout) { should match $packageVersions[:ansiblePlaybook] } + + its(:exit_status) { should eq 0 } + end +end + +shared_examples 'ansible::toolchain::public' do + + ansibleList = [ + $testConfiguration[:ansiblePath] + "/ansible", + $testConfiguration[:ansiblePath] + "/ansible-playbook", + $testConfiguration[:ansiblePath] + "/ansible-galaxy", + $testConfiguration[:ansiblePath] + "/ansible-pull", + $testConfiguration[:ansiblePath] + "/ansible-doc", + $testConfiguration[:ansiblePath] + "/ansible-vault", + ].each do |file| + describe file("#{file}") do + # Type check + it { should be_file } + + # Owner test + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + + # Read test + it { should be_readable.by('owner') } + it { should be_readable.by('group') } + it { should be_readable.by('others') } + + # Write test + it { should be_writable.by('owner') } + it { should_not be_writable.by('group') } + it { should_not be_writable.by('others') } + + # Exectuable test + it { should be_executable.by('owner') } + it { should be_executable.by('group') } + it { should be_executable.by('others') } + end + end + + describe command('ansible --version') do + its(:stdout) { should match $packageVersions[:ansible] } + + its(:exit_status) { should eq 0 } + end + + describe command('ansible-playbook --version') do + its(:stdout) { should match $packageVersions[:ansiblePlaybook] } + + its(:exit_status) { should eq 0 } + end +end diff --git a/tests/serverspec/spec/shared/base/toolchain.rb b/tests/serverspec/spec/shared/base/toolchain.rb new file mode 100644 index 000000000..9e363f8d6 --- /dev/null +++ b/tests/serverspec/spec/shared/base/toolchain.rb @@ -0,0 +1,5 @@ +shared_examples 'base::toolchain' do + describe command('rpl --version') do + its(:exit_status) { should eq 0 } + end +end diff --git a/tests/serverspec/spec/shared/bootstrap/ansible.rb b/tests/serverspec/spec/shared/bootstrap/ansible.rb deleted file mode 100644 index ed1423e14..000000000 --- a/tests/serverspec/spec/shared/bootstrap/ansible.rb +++ /dev/null @@ -1,47 +0,0 @@ -shared_examples 'bootstrap::ansible' do - - ansibleList = [ - $testConfiguration[:ansiblePath] + "/ansible", - $testConfiguration[:ansiblePath] + "/ansible-playbook", - $testConfiguration[:ansiblePath] + "/ansible-galaxy", - $testConfiguration[:ansiblePath] + "/ansible-pull", - $testConfiguration[:ansiblePath] + "/ansible-doc", - $testConfiguration[:ansiblePath] + "/ansible-vault", - ].each do |file| - describe file("#{file}") do - # Type check - it { should be_file } - - # Owner test - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - - # Read test - it { should be_readable.by('owner') } - it { should be_readable.by('group') } - it { should_not be_readable.by('others') } - - # Write test - it { should be_writable.by('owner') } - it { should_not be_writable.by('group') } - it { should_not be_writable.by('others') } - - # Exectuable test - it { should be_executable.by('owner') } - it { should be_executable.by('group') } - it { should_not be_executable.by('others') } - end - end - - describe command('ansible --version') do - its(:stdout) { should match $packageVersions[:ansible] } - - its(:exit_status) { should eq 0 } - end - - describe command('ansible-playbook --version') do - its(:stdout) { should match $packageVersions[:ansiblePlaybook] } - - its(:exit_status) { should eq 0 } - end -end diff --git a/tests/serverspec/spec/shared/bootstrap/toolchain.rb b/tests/serverspec/spec/shared/python/toolchain.rb similarity index 78% rename from tests/serverspec/spec/shared/bootstrap/toolchain.rb rename to tests/serverspec/spec/shared/python/toolchain.rb index 2fa80796a..8eeb1ea68 100644 --- a/tests/serverspec/spec/shared/bootstrap/toolchain.rb +++ b/tests/serverspec/spec/shared/python/toolchain.rb @@ -1,4 +1,4 @@ -shared_examples 'bootstrap::toolchain' do +shared_examples 'python::toolchain' do describe command('python --version') do its(:exit_status) { should eq 0 } @@ -15,8 +15,4 @@ describe command('pip --help') do its(:exit_status) { should eq 0 } end - - describe command('rpl --version') do - its(:exit_status) { should eq 0 } - end end From 862f1b5369e91b9fdc3584e0de8da1e5a5bca8e9 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 3 Apr 2017 18:20:25 +0200 Subject: [PATCH 07/58] Added go-replace Replaced rpl with go-replace (no python dependency) --- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../alpine-3/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../centos-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-8/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-9/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- docker/bootstrap/alpine-3/Dockerfile | 4 ++++ docker/bootstrap/centos-7/Dockerfile | 2 ++ docker/bootstrap/debian-7/Dockerfile | 2 ++ docker/bootstrap/debian-8/Dockerfile | 2 ++ docker/bootstrap/debian-9/Dockerfile | 2 ++ docker/bootstrap/ubuntu-12.04/Dockerfile | 2 ++ docker/bootstrap/ubuntu-14.04/Dockerfile | 2 ++ docker/bootstrap/ubuntu-15.04/Dockerfile | 2 ++ docker/bootstrap/ubuntu-15.10/Dockerfile | 2 ++ docker/bootstrap/ubuntu-16.04/Dockerfile | 2 ++ docker/bootstrap/ubuntu-16.10/Dockerfile | 2 ++ .../ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../alpine-3/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../centos-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-8/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-9/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../alpine-3/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../centos-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../debian-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../debian-8/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../debian-9/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/12-development.sh | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../alpine-3/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../centos-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-7/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-8/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../debian-9/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../alpine-3/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../centos-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../debian-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../debian-8/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../debian-9/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/12-development.sh | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../alpine-3/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../centos-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-7/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-8/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../debian-9/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- docker/samson-deployment/latest/Dockerfile | 2 ++ .../latest/conf/bin/service.d/nginx.d/10-init.sh | 4 ++-- .../latest/conf/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../varnish/latest/conf/bin/entrypoint.d/varnishd.sh | 4 ++-- .../general/bin/service.d/httpd.d/12-development.sh | 2 +- .../apache/general/bin/service.d/httpd.d/10-init.sh | 10 +++++----- .../base/general/bin/service.d/syslog-ng.d/10-init.sh | 2 +- .../general/bin/service.d/nginx.d/12-development.sh | 2 +- .../nginx/general/bin/service.d/nginx.d/10-init.sh | 10 +++++----- .../general/bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../general/bin/service.d/nginx.d/10-init.sh | 4 ++-- .../varnish/general/bin/entrypoint.d/varnishd.sh | 4 ++-- template/Dockerfile/images/bootstrap.jinja2 | 8 ++++++++ template/Dockerfile/tools.jinja2 | 4 ++++ tests/serverspec/spec/collection/bootstrap.rb | 1 + tests/serverspec/spec/shared/bootstrap/toolchain.rb | 7 +++++++ 191 files changed, 577 insertions(+), 531 deletions(-) create mode 100644 template/Dockerfile/tools.jinja2 create mode 100644 tests/serverspec/spec/shared/bootstrap/toolchain.rb diff --git a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/centos-7/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-15.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-15.10/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-16.04/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/base/ubuntu-16.10/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 6cadb9f48..49191dc1e 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -28,6 +28,8 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + openssl \ + && update-ca-certificates \ && /usr/local/bin/generate-dockerimage-info \ # Install gosu && GOSU_VERSION=1.10 \ @@ -45,4 +47,6 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apk del .gosu-deps \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index c98a3767e..7d8963ca4 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -37,5 +37,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 8a6247326..ceddccdd7 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -47,5 +47,7 @@ RUN set -x \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 5f0fc950c..94a6b9e65 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -47,5 +47,7 @@ RUN set -x \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index f42c666da..8a5dd6e46 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -47,5 +47,7 @@ RUN set -x \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 0e5c4f113..7a257ad16 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -49,5 +49,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index a78eb0fac..a793b9963 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -44,5 +44,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index e53c2ffbe..b05da082b 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -44,5 +44,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 5afe38127..a7709a0cf 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -44,5 +44,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 95c283fa5..9597f4b2d 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -44,5 +44,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 5b14ba41f..1394d88ba 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -44,5 +44,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null 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 index d3f1a0c9c..d87f6f9f2 100644 --- 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 @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf 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 index 299f67e2f..37e5309d6 100644 --- 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 @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf 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 index d3f1a0c9c..d87f6f9f2 100644 --- 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 @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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 index 75a84a4eb..c4bd44ddb 100644 --- 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 @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf 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 index fa4b601a9..200e5a733 100644 --- 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 @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf 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 index 75a84a4eb..c4bd44ddb 100644 --- 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 @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" 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 index b17280ce6..03bc19dc6 100644 --- 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 @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 338808d51..f6458849b 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -52,6 +52,8 @@ RUN set -x \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh index 52df52c8e..15a03248d 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh @@ -2,5 +2,5 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" diff --git a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh b/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh index d9854a5a2..e306fa855 100644 --- a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh +++ b/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh @@ -34,11 +34,11 @@ if [[ -z "$VARNISH_PORT" ]]; then fi if [[ -n "$VARNISH_BACKEND_HOST" ]]; then - rpl --quiet "" "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" > /dev/null + go-replace -s "" -r "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" fi if [[ -n "$VARNISH_BACKEND_PORT" ]]; then - rpl --quiet "" "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" > /dev/null + go-replace -s "" -r "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" fi echo " Starting varnishd..." diff --git a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh index 299f67e2f..37e5309d6 100644 --- a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh +++ b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null diff --git a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh index d3f1a0c9c..d87f6f9f2 100644 --- a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh +++ b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,14 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh b/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh index 22621d2ad..326207e52 100644 --- a/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh +++ b/provisioning/base/general/bin/service.d/syslog-ng.d/10-init.sh @@ -6,5 +6,5 @@ if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/sysl if [[ ! -p /docker.stdout ]]; then # Switch to file (tty docker mode) - rpl --quiet 'pipe("/docker.stdout")' 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf > /dev/null + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf fi diff --git a/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh index fa4b601a9..200e5a733 100644 --- a/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh +++ b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh @@ -1 +1 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_NO_CACHE_PATTERN" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" diff --git a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh index 75a84a4eb..c4bd44ddb 100644 --- a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,14 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_INDEX" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_DOCUMENT_ROOT" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$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" > /dev/null + find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh index b17280ce6..03bc19dc6 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,5 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 +find /opt/docker/etc/php/fpm/pool.d/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" diff --git a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh index 52df52c8e..15a03248d 100644 --- a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh @@ -2,5 +2,5 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$WEB_ALIAS_DOMAIN" > /dev/null -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "" "$HOSTNAME" > /dev/null +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" +find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" diff --git a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh b/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh index d9854a5a2..e306fa855 100644 --- a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh +++ b/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh @@ -34,11 +34,11 @@ if [[ -z "$VARNISH_PORT" ]]; then fi if [[ -n "$VARNISH_BACKEND_HOST" ]]; then - rpl --quiet "" "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" > /dev/null + go-replace -s "" -r "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" fi if [[ -n "$VARNISH_BACKEND_PORT" ]]; then - rpl --quiet "" "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" > /dev/null + go-replace -s "" -r "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" fi echo " Starting varnishd..." diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index 182bde062..ae79bf6d8 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -1,4 +1,5 @@ {% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/tools.jinja2' as tools %} {% macro alpine() -%} # Init bootstrap @@ -13,6 +14,8 @@ RUN set -x \ && /usr/local/bin/apk-install \ bash \ ca-certificates \ + openssl \ + && update-ca-certificates \ && /usr/local/bin/generate-dockerimage-info \ # Install gosu && GOSU_VERSION=1.10 \ @@ -30,6 +33,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ && apk del .gosu-deps \ + {{ tools.goreplace() }} {{ docker.cleanup() }} {%- endmacro %} @@ -57,6 +61,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + {{ tools.goreplace() }} && yum erase -y wget \ {{ docker.cleanup() }} {%- endmacro %} @@ -94,6 +99,7 @@ RUN set -x \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + {{ tools.goreplace() }} && apt-get purge -y -f --force-yes wget dirmngr \ {{ docker.cleanup() }} {%- endmacro %} @@ -133,6 +139,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + {{ tools.goreplace() }} && apt-get purge -y -f --force-yes wget \ {{ docker.cleanup() }} {%- endmacro %} @@ -167,6 +174,7 @@ RUN set -x \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ + {{ tools.goreplace() }} && apt-get purge -y -f --force-yes wget \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 new file mode 100644 index 000000000..4ab2367dc --- /dev/null +++ b/template/Dockerfile/tools.jinja2 @@ -0,0 +1,4 @@ +{% macro goreplace() -%} + ## Install go-replace + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ +{%- endmacro %} diff --git a/tests/serverspec/spec/collection/bootstrap.rb b/tests/serverspec/spec/collection/bootstrap.rb index 8b6423ff4..0936aff20 100644 --- a/tests/serverspec/spec/collection/bootstrap.rb +++ b/tests/serverspec/spec/collection/bootstrap.rb @@ -1,6 +1,7 @@ shared_examples 'collection::bootstrap' do include_examples 'bootstrap::layout' include_examples 'bootstrap::distribution' + include_examples 'bootstrap::toolchain' if (os[:family] == 'alpine') include_examples 'vendor::alpine::apk' diff --git a/tests/serverspec/spec/shared/bootstrap/toolchain.rb b/tests/serverspec/spec/shared/bootstrap/toolchain.rb new file mode 100644 index 000000000..28df4dd01 --- /dev/null +++ b/tests/serverspec/spec/shared/bootstrap/toolchain.rb @@ -0,0 +1,7 @@ +shared_examples 'bootstrap::toolchain' do + describe command('go-replace --version') do + its(:stdout) { should match %r!goreplace[\s]+(version)?[\s]*[0-9]+\.[0-9]+\.[0-9]+! } + + its(:exit_status) { should eq 0 } + end +end From 442aa343e398a3314a5f985ee933d026ebec66b0 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 4 Apr 2017 00:32:10 +0200 Subject: [PATCH 08/58] Add LOG_STDOUT and LOG_STDERR Allows custom redirection of daemon errors and log output to files or eg. /dev/null if not needed --- docker/base/alpine-3/Dockerfile | 2 ++ docker/base/alpine-3/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/centos-7/Dockerfile | 2 ++ docker/base/centos-7/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/debian-7/Dockerfile | 2 ++ docker/base/debian-7/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/debian-8/Dockerfile | 2 ++ docker/base/debian-8/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/debian-9/Dockerfile | 2 ++ docker/base/debian-9/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-12.04/Dockerfile | 2 ++ docker/base/ubuntu-12.04/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-14.04/Dockerfile | 2 ++ docker/base/ubuntu-14.04/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-15.04/Dockerfile | 2 ++ docker/base/ubuntu-15.04/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-15.10/Dockerfile | 2 ++ docker/base/ubuntu-15.10/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-16.04/Dockerfile | 2 ++ docker/base/ubuntu-16.04/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/base/ubuntu-16.10/Dockerfile | 2 ++ docker/base/ubuntu-16.10/conf/bin/entrypoint.sh | 12 ++++++++++-- docker/samson-deployment/latest/Dockerfile | 2 ++ .../samson-deployment/latest/conf/bin/entrypoint.sh | 12 ++++++++++-- .../content/DockerImages/dockerfiles/base-app.rst | 1 + .../docs/content/DockerImages/dockerfiles/base.rst | 5 +++++ .../content/DockerImages/dockerfiles/hhvm-apache.rst | 1 + .../content/DockerImages/dockerfiles/hhvm-nginx.rst | 1 + .../docs/content/DockerImages/dockerfiles/hhvm.rst | 1 + .../dockerfiles/include/environment-base.rst | 9 +++++++++ .../DockerImages/dockerfiles/mail-sandbox.rst | 5 +++-- .../content/DockerImages/dockerfiles/nginx-dev.rst | 2 +- .../docs/content/DockerImages/dockerfiles/nginx.rst | 1 + .../DockerImages/dockerfiles/php-apache-dev.rst | 1 + .../content/DockerImages/dockerfiles/php-apache.rst | 1 + .../content/DockerImages/dockerfiles/php-dev.rst | 1 + .../DockerImages/dockerfiles/php-nginx-dev.rst | 1 + .../content/DockerImages/dockerfiles/php-nginx.rst | 1 + .../docs/content/DockerImages/dockerfiles/php.rst | 1 + .../content/DockerImages/dockerfiles/postfix.rst | 1 + .../DockerImages/dockerfiles/samson-deployment.rst | 1 + provisioning/base/general/bin/entrypoint.sh | 12 ++++++++++-- template/Dockerfile/environment.jinja2 | 2 ++ 43 files changed, 187 insertions(+), 29 deletions(-) create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 7d0c12ba3..17747d8ec 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine-3/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/alpine-3/conf/bin/entrypoint.sh +++ b/docker/base/alpine-3/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index b1c091682..f186ac452 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index cca885e5e..ef4fa818c 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index c913343ea..986983d1f 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 29b520b4d..e280ba432 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index becfd1dcb..8eea7900a 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index d43bfb220..73e23f820 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 18dc1bc6b..6c696ac1e 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 084bde5f6..ab9b12cc0 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index b75881394..b98c40a8f 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 78b78a952..8231613ae 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index f6458849b..32d7eb905 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -62,6 +62,8 @@ RUN set -x \ ############################################################################### ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst index eabb507b9..551c67051 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst @@ -37,4 +37,5 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/base.rst b/documentation/docs/content/DockerImages/dockerfiles/base.rst index 98c6d3df0..029669f58 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/base.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/base.rst @@ -11,6 +11,11 @@ Docker image tags .. include:: include/image-tag-base.rst +Environment variables +--------------------- + +.. include:: include/environment-base.rst + Entrypoint ---------- diff --git a/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/hhvm-apache.rst index 00be291a3..06ebf9952 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.rst .. 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 62c1f2515..23d3ebf78 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.rst .. 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 d87c2f055..154a73aed 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/hhvm.rst @@ -14,6 +14,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst Docker image layout diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst new file mode 100644 index 000000000..d53f797a8 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst @@ -0,0 +1,9 @@ +Base environment variables +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +====================== ============================= ================ +Environment variable Description Default +====================== ============================= ================ +``LOG_STDOUT`` Destination of daemon output *empty* (stdout) +``LOG_STDERR`` Destination of daemon errors *empty* (stdout) +====================== ============================= ================= diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst index ca7218842..bc9b21db7 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst @@ -19,11 +19,12 @@ Tag Distribution name Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst -Base environment variables -^^^^^^^^^^^^^^^^^^^^^^^^^^ +Mail sandbox environment variables +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ====================== ============================= ============= Environment variable Description Default diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst index 574ef1f89..fd603bcbf 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst @@ -15,7 +15,7 @@ Docker image tags Environment variables --------------------- -.. include:: include/environment-base-app.rst +.. include:: include/environment-base.rst .. include:: include/environment-web-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst index 2e1bad583..94aeb1eaf 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst @@ -13,6 +13,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-web.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst index 639d00737..1e80d8fb8 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst @@ -15,6 +15,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst .. include:: include/environment-php-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst index a0deba3e0..f599e46d9 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst @@ -13,6 +13,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. 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 1a2a61550..6e95f6806 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst @@ -15,6 +15,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst .. include:: include/environment-php-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst index bd06053e5..16019d20e 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst @@ -15,6 +15,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst .. include:: include/environment-php-dev.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst index 9cbb2d21d..460dd0b28 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst @@ -13,6 +13,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. 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 17d6e8071..8ce259130 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/php.rst @@ -12,6 +12,7 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst diff --git a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst index 918890ec3..d0fabcab6 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst @@ -13,5 +13,6 @@ Docker image tags Environment variables --------------------- +.. include:: include/environment-base.rst .. 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 d977f4824..3bf4477ce 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/samson-deployment.rst @@ -21,6 +21,7 @@ The original image is only the webbased deployment system and is extended by: Environment variables --------------------- +.. include:: include/environment-base.rst .. include:: include/environment-base-app.rst diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh index bbabcdddb..169a4bb88 100644 --- a/provisioning/base/general/bin/entrypoint.sh +++ b/provisioning/base/general/bin/entrypoint.sh @@ -21,8 +21,16 @@ trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL # link stdout from docker -ln -f -s "/proc/$$/fd/1" /docker.stdout -ln -f -s "/proc/$$/fd/2" /docker.stderr +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr chmod 600 /docker.stdout /docker.stderr # sanitize input and set task diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index 6fdbf56c8..8ee18dbff 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -6,6 +6,8 @@ ENV LC_ALL "{{ charset }}" {% macro homePath() -%} ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" {%- endmacro %} {% macro mailbox() -%} From 2c86d0c70024324b001477db381917928a15e70a Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 4 Apr 2017 19:53:02 +0200 Subject: [PATCH 09/58] Update go-replace and implement --path support --- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- 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/bootstrap/ubuntu-16.10/Dockerfile | 4 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../conf/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- docker/samson-deployment/latest/Dockerfile | 4 +- .../conf/bin/service.d/nginx.d/10-init.sh | 15 +++++++- .../bin/service.d/httpd.d/12-development.sh | 7 +++- .../general/bin/service.d/httpd.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/nginx.d/12-development.sh | 8 +++- .../general/bin/service.d/nginx.d/10-init.sh | 38 ++++++++++++++++--- .../bin/service.d/php-fpm.d/11-clear-env.sh | 7 +++- .../general/bin/service.d/nginx.d/10-init.sh | 15 +++++++- template/Dockerfile/tools.jinja2 | 4 +- 173 files changed, 3416 insertions(+), 527 deletions(-) diff --git a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 49191dc1e..3f965089c 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -48,5 +48,7 @@ RUN set -x \ && gosu nobody true \ && apk del .gosu-deps \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 7d8963ca4..bfd9755c1 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -38,6 +38,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index ceddccdd7..142ffd2da 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -48,6 +48,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 94a6b9e65..cbfac5d12 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -48,6 +48,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 8a5dd6e46..df8aa6020 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -48,6 +48,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 7a257ad16..7cd5100be 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -50,6 +50,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index a793b9963..09f910f40 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -45,6 +45,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index b05da082b..4fd33cdea 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -45,6 +45,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index a7709a0cf..7a1c6dba9 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -45,6 +45,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 9597f4b2d..708863086 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -45,6 +45,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 1394d88ba..9ef069d5f 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -45,6 +45,8 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty 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 index d87f6f9f2..8f84e00d6 100644 --- 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 @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf 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 index 37e5309d6..5013c9729 100644 --- 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 @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf 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 index d87f6f9f2..8f84e00d6 100644 --- 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 @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + 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 index c4bd44ddb..20c66eede 100644 --- 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 @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf 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 index 200e5a733..f4695f059 100644 --- 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 @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf 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 index c4bd44ddb..20c66eede 100644 --- 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 @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty 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 index 03bc19dc6..4b6c75d79 100644 --- 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 @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 32d7eb905..54f3e3ca0 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -53,7 +53,9 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh index 15a03248d..72218728d 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh @@ -2,5 +2,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh index 37e5309d6..5013c9729 100644 --- a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh +++ b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh @@ -1 +1,6 @@ -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace "" -r "$WEB_NO_CACHE_PATTERN" -- > /dev/null +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh index d87f6f9f2..8f84e00d6 100644 --- a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh +++ b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh @@ -5,14 +5,42 @@ if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then fi # Replace markers -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf diff --git a/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh index 200e5a733..f4695f059 100644 --- a/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh +++ b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh @@ -1 +1,7 @@ -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_NO_CACHE_PATTERN" +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh index c4bd44ddb..20c66eede 100644 --- a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh @@ -8,14 +8,42 @@ fi ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_INDEX" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_DOCUMENT_ROOT" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_INDEX" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_DOCUMENT_ROOT" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is set - find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_PHP_SOCKET" + go-replace \ + -s "" \ + -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty else ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf diff --git a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh index 03bc19dc6..4b6c75d79 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh @@ -30,5 +30,10 @@ for envVariable in $(printenv|cut -f1 -d=); do 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 go-replace -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" \ + -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty diff --git a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh index 15a03248d..72218728d 100644 --- a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh @@ -2,5 +2,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$WEB_ALIAS_DOMAIN" -find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r go-replace -s "" -r "$HOSTNAME" +go-replace \ + -s "" \ + -r "$WEB_ALIAS_DOMAIN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +go-replace \ + -s "" \ + -r "$HOSTNAME" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 4ab2367dc..b841bebb4 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,4 +1,6 @@ {% macro goreplace() -%} ## Install go-replace - && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/0.2.1/gr-64-linux && chmod +x /usr/local/bin/go-replace \ + && GOREPLACE_VERSION=0.3.1 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ {%- endmacro %} From a49af8ac263781cb55d44622304caf60a6bbdc07 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 5 Apr 2017 21:10:02 +0200 Subject: [PATCH 10/58] Add dnspython for certbot Fixes #168 --- docker/certbot/latest/Dockerfile | 1 + template/Dockerfile/images/certbot.jinja2 | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index cffb503c2..62d4febbb 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -17,6 +17,7 @@ RUN /usr/local/bin/apk-install \ python \ py-crypto \ py2-pip \ + py2-dnspython \ certbot \ && pip install --upgrade pip \ && hash -r \ diff --git a/template/Dockerfile/images/certbot.jinja2 b/template/Dockerfile/images/certbot.jinja2 index 484fd02e3..e9918c92c 100644 --- a/template/Dockerfile/images/certbot.jinja2 +++ b/template/Dockerfile/images/certbot.jinja2 @@ -11,6 +11,7 @@ RUN /usr/local/bin/apk-install \ python \ py-crypto \ py2-pip \ + py2-dnspython \ certbot \ && pip install --upgrade pip \ && hash -r \ From 0a120bc5519816a1b2b77c6f1ba69289eedd2616 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 6 Apr 2017 21:13:40 +0200 Subject: [PATCH 11/58] Update goreplace to 0.5.0 --- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../conf/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- docker/samson-deployment/latest/Dockerfile | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 11 +----- .../latest/conf/bin/entrypoint.d/varnishd.sh | 11 ++---- .../bin/service.d/httpd.d/12-development.sh | 3 +- .../general/bin/service.d/httpd.d/10-init.sh | 38 +++---------------- .../general/bin/service.d/nginx.d/10-init.sh | 38 +++---------------- .../bin/service.d/php-fpm.d/11-clear-env.sh | 3 +- .../general/bin/service.d/nginx.d/10-init.sh | 11 +----- .../general/bin/entrypoint.d/varnishd.sh | 11 ++---- template/Dockerfile/tools.jinja2 | 2 +- 148 files changed, 596 insertions(+), 2947 deletions(-) diff --git a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 3f965089c..b32fc84cf 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && gosu nobody true \ && apk del .gosu-deps \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index bfd9755c1..716df640c 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 142ffd2da..e4479f5f9 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index cbfac5d12..884dda140 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index df8aa6020..7df45000e 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 7cd5100be..6c7898ae1 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -50,7 +50,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 09f910f40..c4aef6b26 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4fd33cdea..56dbcfa8f 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 7a1c6dba9..365d80542 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 708863086..5d8fb1c8a 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 9ef069d5f..89b86f5a8 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/hhvm-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/hhvm-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty 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 index 8f84e00d6..b9d57997e 100644 --- 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 @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /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 index 5013c9729..a9d2c6e92 100644 --- 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 @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi 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 index 8f84e00d6..b9d57997e 100644 --- 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 @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8-php7/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-14.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-15.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.04/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh +++ b/docker/php-apache/ubuntu-16.10/conf/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf 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 index 20c66eede..27b9776cc 100644 --- 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 @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf 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 index 20c66eede..27b9776cc 100644 --- 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 @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8-php7/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-14.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-15.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.04/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/php-nginx/ubuntu-16.10/conf/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty 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 index 4b6c75d79..8bfb3c036 100644 --- 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 @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 54f3e3ca0..56e3201f4 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -53,7 +53,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh index 72218728d..47e13a4d4 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh @@ -3,15 +3,8 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh b/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh index e306fa855..8879926cd 100644 --- a/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh +++ b/docker/varnish/latest/conf/bin/entrypoint.d/varnishd.sh @@ -33,13 +33,10 @@ if [[ -z "$VARNISH_PORT" ]]; then exit 1 fi -if [[ -n "$VARNISH_BACKEND_HOST" ]]; then - go-replace -s "" -r "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" -fi - -if [[ -n "$VARNISH_BACKEND_PORT" ]]; then - go-replace -s "" -r "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" -fi +go-replace \ + -s "" -r "$VARNISH_BACKEND_HOST" \ + -s "" -r "$VARNISH_BACKEND_PORT" \ + -- "$VARNISH_CONFIG" echo " Starting varnishd..." echo " listening on: 0.0.0.0:${VARNISH_PORT}" diff --git a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh index 5013c9729..a9d2c6e92 100644 --- a/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh +++ b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh @@ -1,6 +1,5 @@ go-replace \ - -s "" \ - -r "$WEB_NO_CACHE_PATTERN" \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh index 8f84e00d6..b9d57997e 100644 --- a/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh +++ b/provisioning/apache/general/bin/service.d/httpd.d/10-init.sh @@ -6,42 +6,16 @@ fi # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/httpd/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/httpd/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf fi diff --git a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh index 20c66eede..27b9776cc 100644 --- a/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/nginx/general/bin/service.d/nginx.d/10-init.sh @@ -9,42 +9,16 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty -go-replace \ - -s "" \ - -r "$WEB_DOCUMENT_ROOT" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -if [[ -n "${WEB_PHP_SOCKET+x}" ]]; then - ## WEB_PHP_SOCKET is set - go-replace \ - -s "" \ - -r "$WEB_PHP_SOCKET" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty -else +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then ## WEB_PHP_SOCKET is not set, remove PHP files rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf diff --git a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh index 4b6c75d79..8bfb3c036 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh @@ -31,8 +31,7 @@ done # Replace ;#CLEAR_ENV_WORKAROUND# with environment variable list for all php-fpm pool files go-replace \ - -s ";#CLEAR_ENV_WORKAROUND#" \ - -r "$VARIABLE_LIST" \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ --path-pattern= '*.conf' \ --ignore-empty diff --git a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh index 72218728d..47e13a4d4 100644 --- a/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh +++ b/provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh @@ -3,15 +3,8 @@ ln -f -s /var/lib/nginx/logs /var/log/nginx # Replace markers go-replace \ - -s "" \ - -r "$WEB_ALIAS_DOMAIN" \ - --path=/opt/docker/etc/nginx/ \ - --path-pattern='*.conf' \ - --ignore-empty - -go-replace \ - -s "" \ - -r "$HOSTNAME" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ --path=/opt/docker/etc/nginx/ \ --path-pattern='*.conf' \ --ignore-empty diff --git a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh b/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh index e306fa855..8879926cd 100644 --- a/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh +++ b/provisioning/varnish/general/bin/entrypoint.d/varnishd.sh @@ -33,13 +33,10 @@ if [[ -z "$VARNISH_PORT" ]]; then exit 1 fi -if [[ -n "$VARNISH_BACKEND_HOST" ]]; then - go-replace -s "" -r "$VARNISH_BACKEND_HOST" "$VARNISH_CONFIG" -fi - -if [[ -n "$VARNISH_BACKEND_PORT" ]]; then - go-replace -s "" -r "$VARNISH_BACKEND_PORT" "$VARNISH_CONFIG" -fi +go-replace \ + -s "" -r "$VARNISH_BACKEND_HOST" \ + -s "" -r "$VARNISH_BACKEND_PORT" \ + -- "$VARNISH_CONFIG" echo " Starting varnishd..." echo " listening on: 0.0.0.0:${VARNISH_PORT}" diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index b841bebb4..59fea0e7b 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,6 +1,6 @@ {% macro goreplace() -%} ## Install go-replace - && GOREPLACE_VERSION=0.3.1 \ + && GOREPLACE_VERSION=0.5.0 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ {%- endmacro %} From af4330cace598f56fe9682a62640d3e005699f6b Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 7 Apr 2017 01:16:30 +0200 Subject: [PATCH 12/58] Update goreplace to 0.5.2 --- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 2 +- template/Dockerfile/tools.jinja2 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index b32fc84cf..1e27877ad 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && gosu nobody true \ && apk del .gosu-deps \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 716df640c..bc6b3f71c 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index e4479f5f9..3b7db396b 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 884dda140..79264bbbf 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 7df45000e..0928e06fe 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 6c7898ae1..b5a8312be 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -50,7 +50,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index c4aef6b26..6aa466284 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 56dbcfa8f..4a20b14cf 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 365d80542..f3e1bdaae 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 5d8fb1c8a..71720ea82 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 89b86f5a8..f529bb5be 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 59fea0e7b..eeac1ddf1 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,6 +1,6 @@ {% macro goreplace() -%} ## Install go-replace - && GOREPLACE_VERSION=0.5.0 \ + && GOREPLACE_VERSION=0.5.2 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ {%- endmacro %} From 947057515f34ff86e22f53340c8421897f43e926 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 7 Apr 2017 01:17:06 +0200 Subject: [PATCH 13/58] Add webdevops/liquidsoap --- docker/liquidsoap/latest/Dockerfile | 44 +++++++++ docker/liquidsoap/latest/Dockerfile.jinja2 | 39 ++++++++ .../conf/bin/entrypoint.d/liquidsoap.sh | 11 +++ .../latest/conf/etc/liquidsoap/default.liq | 86 ++++++++++++++++++ .../latest/conf/etc/liquidsoap/default.mp3 | Bin 0 -> 4409 bytes .../conf/etc/liquidsoap/playlist-day.pls | 1 + .../conf/etc/liquidsoap/playlist-night.pls | 1 + docker/samson-deployment/latest/Dockerfile | 2 +- template/Dockerfile/images/liquidsoap.jinja2 | 18 ++++ template/Dockerfile/layout.jinja2 | 1 + 10 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 docker/liquidsoap/latest/Dockerfile create mode 100644 docker/liquidsoap/latest/Dockerfile.jinja2 create mode 100644 docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh create mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq create mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 create mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-day.pls create mode 100644 docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-night.pls create mode 100644 template/Dockerfile/images/liquidsoap.jinja2 diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile new file mode 100644 index 000000000..abeb074f9 --- /dev/null +++ b/docker/liquidsoap/latest/Dockerfile @@ -0,0 +1,44 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/liquidsoap:latest +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/base:latest + +# Install services +RUN /usr/local/bin/apt-install \ + liquidsoap \ + liquidsoap-plugin-all \ + mplayer \ + gstreamer0.10-plugins-base \ + gstreamer0.10-plugins-good \ + && /usr/local/bin/docker-image-cleanup + +ENV LIQUIDSOAP_USER "liquidsoap" +ENV LIQUIBASE_TELNET "1" + +ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" +ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" + +ENV LIQUIBASE_STREAM_INPUT "http://icecast:8000/live" + +ENV LIQUIBASE_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" + +ENV LIQUIBASE_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" +ENV LIQUIBASE_PLAYLIST_DAY_TIMERANGE "4h-2h" + +ENV LIQUIBASE_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" +ENV LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE "2h-14h" + +ENV LIQUIBASE_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" + +ENV LIQUIBASE_META_NAME "Liquidsoap Docker" +ENV LIQUIBASE_META_GENRE "" +ENV LIQUIBASE_META_URL "" +ENV LIQUIBASE_META_DESCRIPTION "" + +COPY conf/ /opt/docker/ + +CMD ["liquidsoap"] + +EXPOSE 1234 diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 new file mode 100644 index 000000000..fe7afe459 --- /dev/null +++ b/docker/liquidsoap/latest/Dockerfile.jinja2 @@ -0,0 +1,39 @@ +{{ docker.from("base","latest") }} + +# Install services +RUN /usr/local/bin/apt-install \ + liquidsoap \ + liquidsoap-plugin-all \ + mplayer \ + gstreamer0.10-plugins-base \ + gstreamer0.10-plugins-good \ + {{ docker.cleanup() }} + +ENV LIQUIDSOAP_USER "liquidsoap" +ENV LIQUIBASE_TELNET "1" + +ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" +ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" + +ENV LIQUIBASE_STREAM_INPUT "http://icecast:8000/live" + +ENV LIQUIBASE_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" + +ENV LIQUIBASE_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" +ENV LIQUIBASE_PLAYLIST_DAY_TIMERANGE "4h-2h" + +ENV LIQUIBASE_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" +ENV LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE "2h-14h" + +ENV LIQUIBASE_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" + +ENV LIQUIBASE_META_NAME "Liquidsoap Docker" +ENV LIQUIBASE_META_GENRE "" +ENV LIQUIBASE_META_URL "" +ENV LIQUIBASE_META_DESCRIPTION "" + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ docker.cmd("liquidsoap") }} + +{{ docker.expose('1234') }} diff --git a/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh b/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh new file mode 100644 index 000000000..20825ab0a --- /dev/null +++ b/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +############################################# +## Configure and run liquibase +############################################# + +if [[ -n "$LIQUIDSOAP_TEMPLATE" ]]; then + go-replace --mode=template -s Foobar -r Foobar -- "$LIQUIDSOAP_TEMPLATE" +fi + +exec gosu "$LIQUIDSOAP_USER" liquidsoap "$LIQUIDSOAP_SCRIPT" diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq new file mode 100644 index 000000000..35e6812c7 --- /dev/null +++ b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq @@ -0,0 +1,86 @@ +#!/usr/bin/liquidsoap + +# Lines starting with # are comments, they are ignored. + +# Log path +set("log.file.path","/dev/null") + +# Print log messages to the console, +# can also be done by passing the -v option to liquidsoap. +set("log.stdout", true) + +# Use the telnet server for requests +{{if .Env.LIQUIBASE_TELNET}} +set("server.telnet", true) +{{end}} + +################## +# Settings +################## + +DJ_stream = "{{.Env.LIQUIBASE_STREAM_INPUT}}" + +PLAYLIST_default = {{.Env.LIQUIBASE_PLAYLIST_DEFAULT}} +PLAYLIST_day = {{.Env.LIQUIBASE_PLAYLIST_DAY}} +PLAYLIST_night = {{.Env.LIQUIBASE_PLAYLIST_NIGHT}} + +META_name = "{{.Env.LIQUIBASE_META_NAME}}" +META_genre = "{{.Env.LIQUIBASE_META_GENRE}}" +META_url = "{{.Env.LIQUIBASE_META_URL}}" +META_desc = "{{.Env.LIQUIBASE_META_DESCRIPTION}}" + +## fetch dj stream +DJ_input = input.http(DJ_stream) + +## fadeout dj +#DJ_input = fade.out(merge_tracks(DJ_input)) + +# Play user requests if there are any, +# otherwise one of our playlists, +# and the default file if anything goes wrong. +PLAYLIST_input = fallback([ + switch([({ {{.Env.LIQUIBASE_PLAYLIST_DAY_TIMERANGE}} }, PLAYLIST_day), + ({ {{.Env.LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE}} }, PLAYLIST_night)]), + PLAYLIST_default +]) + +## add fade +PLAYLIST_input = smart_crossfade(fade_out=0.5, fade_in=0.5, PLAYLIST_input) + +## set title +PLAYLIST_input = rewrite_metadata( + [ + ("title", "$(title)"), + ("comment", "{{.Env.LIQUIBASE_META_URL}}") + ], + PLAYLIST_input +) + +# Add the ability to relay live shows +ALL_input = fallback(track_sensitive=false, [DJ_input, PLAYLIST_input]) + +################# +# Output +################# + +{{.Env.LIQUIBASE_OUTPUT}} +{{.Env.LIQUIBASE_OUTPUT_1}} +{{.Env.LIQUIBASE_OUTPUT_2}} +{{.Env.LIQUIBASE_OUTPUT_3}} +{{.Env.LIQUIBASE_OUTPUT_4}} +{{.Env.LIQUIBASE_OUTPUT_5}} +{{.Env.LIQUIBASE_OUTPUT_6}} +{{.Env.LIQUIBASE_OUTPUT_7}} +{{.Env.LIQUIBASE_OUTPUT_8}} +{{.Env.LIQUIBASE_OUTPUT_9}} +{{.Env.LIQUIBASE_OUTPUT_10}} +{{.Env.LIQUIBASE_OUTPUT_11}} +{{.Env.LIQUIBASE_OUTPUT_12}} +{{.Env.LIQUIBASE_OUTPUT_13}} +{{.Env.LIQUIBASE_OUTPUT_14}} +{{.Env.LIQUIBASE_OUTPUT_15}} +{{.Env.LIQUIBASE_OUTPUT_16}} +{{.Env.LIQUIBASE_OUTPUT_17}} +{{.Env.LIQUIBASE_OUTPUT_18}} +{{.Env.LIQUIBASE_OUTPUT_19}} +{{.Env.LIQUIBASE_OUTPUT_20}} diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..c8a0bf931602f48521a36f8d52f61eb1b124a293 GIT binary patch literal 4409 zcmeH}zfQw25XL_kSddWZz=q_luvD&7!W`Q2Pb7_~7se{F+Cbz=O-jYed+;U<9e5K) z9-`Q!Em8+6XXt`&axVAt-F@d+xoJDQPk>QmWf&#n~s1l%EA|ub|b*IkiZV^0O1_#}HAA~M!^TKIvj-hlFQ)GKxX6yOk z#d+|ofO7^M6#7MiP)0I6A!}9vtAJI&Dqt1( zcM8luD>K#f&bvY9nyHmw)USwPp6YC3$UqnOW(aBKqXhG1%v5J{L*}O;Q%E Date: Fri, 7 Apr 2017 01:20:29 +0200 Subject: [PATCH 14/58] Add webdevops/php-official Adapt official php images to webdevops/php-officlal and webdevops/php* --- .../DockerTestServerspecTaskLoader.py | 4 +- conf/console.yml | 3 + conf/provision.yml | 15 +- docker/php-apache-dev/5.6/Dockerfile | 35 ++ docker/php-apache-dev/5.6/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../5.6/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../5.6/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../bin/service.d/httpd.d/12-development.sh | 5 + .../5.6/conf/bin/service.d/httpd.sh | 12 + .../5.6/conf/etc/httpd/conf.d/.gitkeep | 0 .../5.6/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../etc/httpd/conf.d/10-error-document.conf | 15 + .../5.6/conf/etc/httpd/conf.d/10-log.conf | 4 + .../5.6/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../5.6/conf/etc/httpd/conf.d/10-server.conf | 18 + .../5.6/conf/etc/httpd/global.conf | 1 + .../5.6/conf/etc/httpd/main.conf | 12 + .../5.6/conf/etc/httpd/php.conf | 1 + .../5.6/conf/etc/httpd/ssl/server.crt | 28 ++ .../5.6/conf/etc/httpd/ssl/server.csr | 26 ++ .../5.6/conf/etc/httpd/ssl/server.key | 51 +++ .../5.6/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 | 10 + .../5.6/conf/etc/httpd/vhost.conf | 36 ++ .../5.6/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../5.6/conf/etc/supervisor.d/apache.conf | 14 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-apache-dev}/defaults/main.yml | 0 .../webdevops-apache-dev/tasks/bootstrap.yml | 2 + .../webdevops-apache-dev}/tasks/main.yml | 0 .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../roles/webdevops-apache}/tasks/main.yml | 0 .../webdevops-php-apache/defaults/main.yml | 1 + .../webdevops-php-apache/tasks/bootstrap.yml | 8 + .../webdevops-php-apache/tasks/entrypoint.yml | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + .../webdevops-php-dev}/defaults/main.yml | 0 .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml} | 4 +- .../roles/webdevops-php-dev}/tasks/main.yml | 0 docker/php-apache-dev/7.0/Dockerfile | 35 ++ docker/php-apache-dev/7.0/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.0/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../7.0/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../bin/service.d/httpd.d/12-development.sh | 5 + .../7.0/conf/bin/service.d/httpd.sh | 12 + .../7.0/conf/etc/httpd/conf.d/.gitkeep | 0 .../7.0/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../etc/httpd/conf.d/10-error-document.conf | 15 + .../7.0/conf/etc/httpd/conf.d/10-log.conf | 4 + .../7.0/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../7.0/conf/etc/httpd/conf.d/10-server.conf | 18 + .../7.0/conf/etc/httpd/global.conf | 1 + .../7.0/conf/etc/httpd/main.conf | 12 + .../7.0/conf/etc/httpd/php.conf | 1 + .../7.0/conf/etc/httpd/ssl/server.crt | 28 ++ .../7.0/conf/etc/httpd/ssl/server.csr | 26 ++ .../7.0/conf/etc/httpd/ssl/server.key | 51 +++ .../7.0/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 | 10 + .../7.0/conf/etc/httpd/vhost.conf | 36 ++ .../7.0/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../7.0/conf/etc/supervisor.d/apache.conf | 14 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-apache-dev}/defaults/main.yml | 0 .../webdevops-apache-dev/tasks/bootstrap.yml | 2 + .../roles/webdevops-apache-dev/tasks/main.yml | 5 + .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../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 | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml | 23 ++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + docker/php-apache-dev/7.1/Dockerfile | 35 ++ docker/php-apache-dev/7.1/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.1/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../7.1/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../bin/service.d/httpd.d/12-development.sh | 5 + .../7.1/conf/bin/service.d/httpd.sh | 12 + .../7.1/conf/etc/httpd/conf.d/.gitkeep | 0 .../7.1/conf/etc/httpd/conf.d/02-dev.conf | 8 + .../etc/httpd/conf.d/10-error-document.conf | 15 + .../7.1/conf/etc/httpd/conf.d/10-log.conf | 4 + .../7.1/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../7.1/conf/etc/httpd/conf.d/10-server.conf | 18 + .../7.1/conf/etc/httpd/global.conf | 1 + .../7.1/conf/etc/httpd/main.conf | 12 + .../7.1/conf/etc/httpd/php.conf | 1 + .../7.1/conf/etc/httpd/ssl/server.crt | 28 ++ .../7.1/conf/etc/httpd/ssl/server.csr | 26 ++ .../7.1/conf/etc/httpd/ssl/server.key | 51 +++ .../7.1/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 | 10 + .../7.1/conf/etc/httpd/vhost.conf | 36 ++ .../7.1/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../7.1/conf/etc/supervisor.d/apache.conf | 14 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-apache-dev/defaults/main.yml | 6 + .../webdevops-apache-dev/tasks/bootstrap.yml | 2 + .../roles/webdevops-apache-dev/tasks/main.yml | 5 + .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../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 | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml | 23 ++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + docker/php-apache/5.6/Dockerfile | 34 ++ docker/php-apache/5.6/Dockerfile.jinja2 | 12 + .../5.6/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../5.6/conf/bin/service.d/httpd.sh | 12 + .../5.6/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../5.6/conf/etc/httpd/conf.d/10-log.conf | 4 + .../5.6/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../5.6/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/5.6/conf/etc/httpd/global.conf | 1 + .../php-apache/5.6/conf/etc/httpd/main.conf | 12 + docker/php-apache/5.6/conf/etc/httpd/php.conf | 1 + .../5.6/conf/etc/httpd/ssl/server.crt | 28 ++ .../5.6/conf/etc/httpd/ssl/server.csr | 26 ++ .../5.6/conf/etc/httpd/ssl/server.key | 51 +++ .../5.6/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/5.6/conf/etc/httpd/vhost.conf | 36 ++ .../5.6/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../5.6/conf/etc/supervisor.d/apache.conf | 14 + .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../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 | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + docker/php-apache/7.0/Dockerfile | 34 ++ docker/php-apache/7.0/Dockerfile.jinja2 | 12 + .../7.0/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../7.0/conf/bin/service.d/httpd.sh | 12 + .../7.0/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../7.0/conf/etc/httpd/conf.d/10-log.conf | 4 + .../7.0/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../7.0/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/7.0/conf/etc/httpd/global.conf | 1 + .../php-apache/7.0/conf/etc/httpd/main.conf | 12 + docker/php-apache/7.0/conf/etc/httpd/php.conf | 1 + .../7.0/conf/etc/httpd/ssl/server.crt | 28 ++ .../7.0/conf/etc/httpd/ssl/server.csr | 26 ++ .../7.0/conf/etc/httpd/ssl/server.key | 51 +++ .../7.0/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/7.0/conf/etc/httpd/vhost.conf | 36 ++ .../7.0/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../7.0/conf/etc/supervisor.d/apache.conf | 14 + .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../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 | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + docker/php-apache/7.1/Dockerfile | 34 ++ docker/php-apache/7.1/Dockerfile.jinja2 | 12 + .../7.1/conf/bin/service.d/httpd.d/10-init.sh | 21 ++ .../7.1/conf/bin/service.d/httpd.sh | 12 + .../7.1/conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 15 + .../7.1/conf/etc/httpd/conf.d/10-log.conf | 4 + .../7.1/conf/etc/httpd/conf.d/10-php.conf | 37 ++ .../7.1/conf/etc/httpd/conf.d/10-server.conf | 18 + .../php-apache/7.1/conf/etc/httpd/global.conf | 1 + .../php-apache/7.1/conf/etc/httpd/main.conf | 12 + docker/php-apache/7.1/conf/etc/httpd/php.conf | 1 + .../7.1/conf/etc/httpd/ssl/server.crt | 28 ++ .../7.1/conf/etc/httpd/ssl/server.csr | 26 ++ .../7.1/conf/etc/httpd/ssl/server.key | 51 +++ .../7.1/conf/etc/httpd/vhost.common.conf | 7 + .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 1 + .../php-apache/7.1/conf/etc/httpd/vhost.conf | 36 ++ .../7.1/conf/etc/httpd/vhost.ssl.conf | 26 ++ .../7.1/conf/etc/supervisor.d/apache.conf | 14 + .../roles/webdevops-apache/defaults/main.yml | 3 + .../webdevops-apache/tasks/bootstrap.yml | 156 +++++++++ .../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 | 2 + .../roles/webdevops-php-apache/tasks/main.yml | 9 + .../php-dev/debian-7-php7/Dockerfile.disabled | 26 -- .../debian-7-php7/Dockerfile.jinja2.disabled | 7 - docker/php-nginx-dev/5.6/Dockerfile | 28 ++ docker/php-nginx-dev/5.6/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../5.6/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../5.6/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../bin/service.d/nginx.d/12-development.sh | 7 + .../5.6/conf/bin/service.d/nginx.sh | 7 + .../5.6/conf/etc/nginx/conf.d/.gitkeep | 0 .../5.6/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../5.6/conf/etc/nginx/conf.d/10-php.conf | 3 + .../5.6/conf/etc/nginx/global.conf | 1 + .../5.6/conf/etc/nginx/main.conf | 4 + .../php-nginx-dev/5.6/conf/etc/nginx/php.conf | 1 + .../5.6/conf/etc/nginx/ssl/server.crt | 28 ++ .../5.6/conf/etc/nginx/ssl/server.csr | 26 ++ .../5.6/conf/etc/nginx/ssl/server.key | 51 +++ .../5.6/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../5.6/conf/etc/nginx/vhost.conf | 26 ++ .../5.6/conf/etc/nginx/vhost.ssl.conf | 7 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../5.6/conf/etc/supervisor.d/nginx.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-nginx-dev/defaults/main.yml | 6 + .../webdevops-nginx-dev/tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 + .../roles/webdevops-nginx-dev/tasks/main.yml | 5 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml | 23 ++ .../roles/webdevops-php-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 | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-nginx-dev/7.0/Dockerfile | 28 ++ docker/php-nginx-dev/7.0/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.0/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../7.0/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../bin/service.d/nginx.d/12-development.sh | 7 + .../7.0/conf/bin/service.d/nginx.sh | 7 + .../7.0/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.0/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../7.0/conf/etc/nginx/conf.d/10-php.conf | 3 + .../7.0/conf/etc/nginx/global.conf | 1 + .../7.0/conf/etc/nginx/main.conf | 4 + .../php-nginx-dev/7.0/conf/etc/nginx/php.conf | 1 + .../7.0/conf/etc/nginx/ssl/server.crt | 28 ++ .../7.0/conf/etc/nginx/ssl/server.csr | 26 ++ .../7.0/conf/etc/nginx/ssl/server.key | 51 +++ .../7.0/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../7.0/conf/etc/nginx/vhost.conf | 26 ++ .../7.0/conf/etc/nginx/vhost.ssl.conf | 7 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../7.0/conf/etc/supervisor.d/nginx.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-nginx-dev/defaults/main.yml | 6 + .../webdevops-nginx-dev/tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 + .../roles/webdevops-nginx-dev/tasks/main.yml | 5 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml | 23 ++ .../roles/webdevops-php-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 | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-nginx-dev/7.1/Dockerfile | 28 ++ docker/php-nginx-dev/7.1/Dockerfile.jinja2 | 13 + .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.1/conf/bin/service.d/blackfire-agent.sh | 23 ++ .../7.1/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../bin/service.d/nginx.d/12-development.sh | 7 + .../7.1/conf/bin/service.d/nginx.sh | 7 + .../7.1/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.1/conf/etc/nginx/conf.d/02-dev.conf | 1 + .../7.1/conf/etc/nginx/conf.d/10-php.conf | 3 + .../7.1/conf/etc/nginx/global.conf | 1 + .../7.1/conf/etc/nginx/main.conf | 4 + .../php-nginx-dev/7.1/conf/etc/nginx/php.conf | 1 + .../7.1/conf/etc/nginx/ssl/server.crt | 28 ++ .../7.1/conf/etc/nginx/ssl/server.csr | 26 ++ .../7.1/conf/etc/nginx/ssl/server.key | 51 +++ .../7.1/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 6 + .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../7.1/conf/etc/nginx/vhost.conf | 26 ++ .../7.1/conf/etc/nginx/vhost.ssl.conf | 7 + .../etc/supervisor.d/blackfire-agent.conf | 14 + .../7.1/conf/etc/supervisor.d/nginx.conf | 14 + .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++ .../webdevops-nginx-dev/defaults/main.yml | 6 + .../webdevops-nginx-dev/tasks/bootstrap.yml | 3 + .../tasks/bootstrap/nginx.yml | 9 + .../roles/webdevops-nginx-dev/tasks/main.yml | 5 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 + .../webdevops-php-dev/tasks/bootstrap.yml | 8 + .../tasks/bootstrap/php-fpm.yml | 18 + .../tasks/bootstrap/php-module.blackfire.yml | 10 + .../tasks/bootstrap/php-module.opcache.yml | 14 + .../tasks/bootstrap/php-module.xdebug.yml | 28 ++ .../tasks/bootstrap/php-module.yml | 41 +++ .../tasks/bootstrap/tools.yml | 23 ++ .../roles/webdevops-php-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 | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-nginx/5.6/Dockerfile | 27 ++ docker/php-nginx/5.6/Dockerfile.jinja2 | 12 + .../5.6/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../php-nginx/5.6/conf/bin/service.d/nginx.sh | 7 + .../5.6/conf/etc/nginx/conf.d/.gitkeep | 0 .../5.6/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/5.6/conf/etc/nginx/global.conf | 1 + docker/php-nginx/5.6/conf/etc/nginx/main.conf | 4 + docker/php-nginx/5.6/conf/etc/nginx/php.conf | 1 + .../5.6/conf/etc/nginx/ssl/server.crt | 28 ++ .../5.6/conf/etc/nginx/ssl/server.csr | 26 ++ .../5.6/conf/etc/nginx/ssl/server.key | 51 +++ .../5.6/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/5.6/conf/etc/nginx/vhost.conf | 26 ++ .../5.6/conf/etc/nginx/vhost.ssl.conf | 7 + .../5.6/conf/etc/supervisor.d/nginx.conf | 14 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 + .../webdevops-php-nginx/tasks/entrypoint.yml | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-nginx/7.0/Dockerfile | 27 ++ docker/php-nginx/7.0/Dockerfile.jinja2 | 12 + .../7.0/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../php-nginx/7.0/conf/bin/service.d/nginx.sh | 7 + .../7.0/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.0/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/7.0/conf/etc/nginx/global.conf | 1 + docker/php-nginx/7.0/conf/etc/nginx/main.conf | 4 + docker/php-nginx/7.0/conf/etc/nginx/php.conf | 1 + .../7.0/conf/etc/nginx/ssl/server.crt | 28 ++ .../7.0/conf/etc/nginx/ssl/server.csr | 26 ++ .../7.0/conf/etc/nginx/ssl/server.key | 51 +++ .../7.0/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/7.0/conf/etc/nginx/vhost.conf | 26 ++ .../7.0/conf/etc/nginx/vhost.ssl.conf | 7 + .../7.0/conf/etc/supervisor.d/nginx.conf | 14 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 + .../webdevops-php-nginx/tasks/entrypoint.yml | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-nginx/7.1/Dockerfile | 27 ++ docker/php-nginx/7.1/Dockerfile.jinja2 | 12 + .../7.1/conf/bin/service.d/nginx.d/10-init.sh | 25 ++ .../php-nginx/7.1/conf/bin/service.d/nginx.sh | 7 + .../7.1/conf/etc/nginx/conf.d/.gitkeep | 0 .../7.1/conf/etc/nginx/conf.d/10-php.conf | 3 + .../php-nginx/7.1/conf/etc/nginx/global.conf | 1 + docker/php-nginx/7.1/conf/etc/nginx/main.conf | 4 + docker/php-nginx/7.1/conf/etc/nginx/php.conf | 1 + .../7.1/conf/etc/nginx/ssl/server.crt | 28 ++ .../7.1/conf/etc/nginx/ssl/server.csr | 26 ++ .../7.1/conf/etc/nginx/ssl/server.key | 51 +++ .../7.1/conf/etc/nginx/vhost.common.conf | 2 + .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 1 + .../vhost.common.d/10-location-root.conf | 3 + .../conf/etc/nginx/vhost.common.d/10-log.conf | 2 + .../conf/etc/nginx/vhost.common.d/10-php.conf | 7 + .../php-nginx/7.1/conf/etc/nginx/vhost.conf | 26 ++ .../7.1/conf/etc/nginx/vhost.ssl.conf | 7 + .../7.1/conf/etc/supervisor.d/nginx.conf | 14 + .../roles/webdevops-nginx/defaults/main.yml | 3 + .../roles/webdevops-nginx/tasks/bootstrap.yml | 86 +++++ .../roles/webdevops-nginx/tasks/main.yml | 5 + .../webdevops-php-nginx/defaults/main.yml | 1 + .../webdevops-php-nginx/tasks/bootstrap.yml | 9 + .../webdevops-php-nginx/tasks/entrypoint.yml | 2 + .../roles/webdevops-php-nginx/tasks/main.yml | 9 + docker/php-official/5.6/Dockerfile | 146 ++++++++ docker/php-official/5.6/Dockerfile.jinja2 | 24 ++ docker/php-official/5.6/baselayout.tar | Bin 0 -> 9601 bytes docker/php-official/5.6/conf/VERSION | 1 + docker/php-official/5.6/conf/bin/bootstrap.sh | 49 +++ docker/php-official/5.6/conf/bin/config.sh | 166 +++++++++ docker/php-official/5.6/conf/bin/control.sh | 170 +++++++++ .../5.6/conf/bin/entrypoint.d/cli.sh | 19 + .../5.6/conf/bin/entrypoint.d/default.sh | 3 + .../5.6/conf/bin/entrypoint.d/noop.sh | 8 + .../5.6/conf/bin/entrypoint.d/root.sh | 14 + .../5.6/conf/bin/entrypoint.d/supervisord.sh | 11 + .../php-official/5.6/conf/bin/entrypoint.sh | 57 +++ docker/php-official/5.6/conf/bin/logwatch.sh | 14 + docker/php-official/5.6/conf/bin/provision | 328 ++++++++++++++++++ docker/php-official/5.6/conf/bin/provision.sh | 30 ++ .../5.6/conf/bin/service.d/cron.d/10-init.sh | 1 + .../5.6/conf/bin/service.d/cron.sh | 7 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 32 ++ .../5.6/conf/bin/service.d/dnsmasq.sh | 7 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 8 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../5.6/conf/bin/service.d/php-fpm.sh | 7 + .../conf/bin/service.d/postfix.d/10-init.sh | 24 ++ .../5.6/conf/bin/service.d/postfix.sh | 37 ++ .../5.6/conf/bin/service.d/ssh.d/10-init.sh | 2 + .../5.6/conf/bin/service.d/ssh.sh | 7 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../5.6/conf/bin/service.d/supervisor.sh | 7 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../5.6/conf/bin/service.d/syslog-ng.sh | 8 + .../5.6/conf/etc/logrotate.d/php5-fpm | 12 + .../5.6/conf/etc/logrotate.d/syslog-ng | 38 ++ .../5.6/conf/etc/php/conf.d/.gitkeep | 0 docker/php-official/5.6/conf/etc/php/php.ini | 1 + .../5.6/conf/etc/php/php.webdevops.ini | 33 ++ .../php-official/5.6/conf/etc/supervisor.conf | 13 + .../5.6/conf/etc/supervisor.d/.gitkeep | 0 .../5.6/conf/etc/supervisor.d/cron.conf | 14 + .../5.6/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../5.6/conf/etc/supervisor.d/php-fpm.conf | 15 + .../5.6/conf/etc/supervisor.d/postfix.conf | 15 + .../5.6/conf/etc/supervisor.d/ssh.conf | 14 + .../5.6/conf/etc/supervisor.d/syslog-ng.conf} | 9 +- .../5.6/conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../5.6/conf/provision/ansible.cfg | 0 .../5.6/conf/provision/bootstrap.d/.gitkeep | 0 .../5.6/conf/provision/build.d/.gitkeep | 0 .../5.6/conf/provision/build.d/10-cleanup.sh | 6 + .../5.6/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../5.6/conf/provision/onbuild.d/.gitkeep | 0 .../webdevops-base-app/defaults/main.yml | 7 + .../webdevops-base-app/tasks/bootstrap.yml | 7 + .../tasks/bootstrap/application.yml | 10 + .../tasks/bootstrap/dnsmasq.yml | 10 + .../tasks/bootstrap/postfix.yml | 29 ++ .../tasks/bootstrap/ssh.yml | 12 + .../tasks/bootstrap/user.yml | 41 +++ .../roles/webdevops-base-app/tasks/main.yml | 5 + .../roles/webdevops-base/defaults/main.yml | 6 + .../roles/webdevops-base/tasks/bootstrap.yml | 8 + .../webdevops-base/tasks/bootstrap/misc.yml | 8 + .../webdevops-base/tasks/bootstrap/pam.yml | 8 + .../webdevops-base/tasks/bootstrap/root.yml | 5 + .../tasks/bootstrap/supervisor.yml | 6 + .../tasks/bootstrap/syslog-ng.yml | 33 ++ .../webdevops-base/tasks/bootstrap/system.yml | 33 ++ .../roles/webdevops-base/tasks/build.yml | 2 + .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 1 + .../webdevops-base/tasks/entrypoint/.gitkeep | 0 .../roles/webdevops-base/tasks/main.yml | 13 + .../roles/webdevops-cleanup/tasks/cleanup.yml | 16 + .../roles/webdevops-cleanup/tasks/main.yml | 6 + .../roles/webdevops-php/defaults/main.yml | 6 + .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 23 ++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 9 + .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 11 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 23 ++ .../roles/webdevops-php/tasks/main.yml | 5 + .../conf/provision/variables-webdevops.yml | 7 + .../5.6/conf/provision/variables.yml | 7 + docker/php-official/7.0/Dockerfile | 146 ++++++++ docker/php-official/7.0/Dockerfile.jinja2 | 24 ++ docker/php-official/7.0/baselayout.tar | Bin 0 -> 9601 bytes docker/php-official/7.0/conf/VERSION | 1 + docker/php-official/7.0/conf/bin/bootstrap.sh | 49 +++ docker/php-official/7.0/conf/bin/config.sh | 166 +++++++++ docker/php-official/7.0/conf/bin/control.sh | 170 +++++++++ .../7.0/conf/bin/entrypoint.d/cli.sh | 19 + .../7.0/conf/bin/entrypoint.d/default.sh | 3 + .../7.0/conf/bin/entrypoint.d/noop.sh | 8 + .../7.0/conf/bin/entrypoint.d/root.sh | 14 + .../7.0/conf/bin/entrypoint.d/supervisord.sh | 11 + .../php-official/7.0/conf/bin/entrypoint.sh | 57 +++ docker/php-official/7.0/conf/bin/logwatch.sh | 14 + docker/php-official/7.0/conf/bin/provision | 328 ++++++++++++++++++ docker/php-official/7.0/conf/bin/provision.sh | 30 ++ .../7.0/conf/bin/service.d/cron.d/10-init.sh | 1 + .../7.0/conf/bin/service.d/cron.sh | 7 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 32 ++ .../7.0/conf/bin/service.d/dnsmasq.sh | 7 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 8 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../7.0/conf/bin/service.d/php-fpm.sh | 7 + .../conf/bin/service.d/postfix.d/10-init.sh | 24 ++ .../7.0/conf/bin/service.d/postfix.sh | 37 ++ .../7.0/conf/bin/service.d/ssh.d/10-init.sh | 2 + .../7.0/conf/bin/service.d/ssh.sh | 7 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../7.0/conf/bin/service.d/supervisor.sh | 7 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../7.0/conf/bin/service.d/syslog-ng.sh | 8 + .../7.0/conf/etc/logrotate.d/php5-fpm | 12 + .../7.0/conf/etc/logrotate.d/syslog-ng | 38 ++ .../7.0/conf/etc/php/conf.d/.gitkeep | 0 docker/php-official/7.0/conf/etc/php/php.ini | 1 + .../7.0/conf/etc/php/php.webdevops.ini | 33 ++ .../php-official/7.0/conf/etc/supervisor.conf | 13 + .../7.0/conf/etc/supervisor.d/.gitkeep | 0 .../7.0/conf/etc/supervisor.d/cron.conf | 14 + .../7.0/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../7.0/conf/etc/supervisor.d/php-fpm.conf | 15 + .../7.0/conf/etc/supervisor.d/postfix.conf | 15 + .../7.0/conf/etc/supervisor.d/ssh.conf | 14 + .../7.0/conf/etc/supervisor.d/syslog-ng.conf} | 9 +- .../7.0/conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../7.0/conf/provision/ansible.cfg | 0 .../7.0/conf/provision/bootstrap.d/.gitkeep | 0 .../7.0/conf/provision/build.d/.gitkeep | 0 .../7.0/conf/provision/build.d/10-cleanup.sh | 6 + .../7.0/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../7.0/conf/provision/onbuild.d/.gitkeep | 0 .../webdevops-base-app/defaults/main.yml | 7 + .../webdevops-base-app/tasks/bootstrap.yml | 7 + .../tasks/bootstrap/application.yml | 10 + .../tasks/bootstrap/dnsmasq.yml | 10 + .../tasks/bootstrap/postfix.yml | 29 ++ .../tasks/bootstrap/ssh.yml | 12 + .../tasks/bootstrap/user.yml | 41 +++ .../roles/webdevops-base-app/tasks/main.yml | 5 + .../roles/webdevops-base/defaults/main.yml | 6 + .../roles/webdevops-base/tasks/bootstrap.yml | 8 + .../webdevops-base/tasks/bootstrap/misc.yml | 8 + .../webdevops-base/tasks/bootstrap/pam.yml | 8 + .../webdevops-base/tasks/bootstrap/root.yml | 5 + .../tasks/bootstrap/supervisor.yml | 6 + .../tasks/bootstrap/syslog-ng.yml | 33 ++ .../webdevops-base/tasks/bootstrap/system.yml | 33 ++ .../roles/webdevops-base/tasks/build.yml | 2 + .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 1 + .../webdevops-base/tasks/entrypoint/.gitkeep | 0 .../roles/webdevops-base/tasks/main.yml | 13 + .../roles/webdevops-cleanup/tasks/cleanup.yml | 16 + .../roles/webdevops-cleanup/tasks/main.yml | 6 + .../roles/webdevops-php/defaults/main.yml | 6 + .../roles/webdevops-php/tasks/bootstrap.yml | 10 + .../webdevops-php/tasks/bootstrap/init.yml | 23 ++ .../tasks/bootstrap/php-fpm.main.yml | 47 +++ .../tasks/bootstrap/php-fpm.pool.yml | 92 +++++ .../webdevops-php/tasks/bootstrap/php-fpm.yml | 9 + .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 11 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 23 ++ .../roles/webdevops-php/tasks/main.yml | 5 + .../conf/provision/variables-webdevops.yml | 7 + .../7.0/conf/provision/variables.yml | 7 + docker/php-official/7.1/Dockerfile | 146 ++++++++ docker/php-official/7.1/Dockerfile.jinja2 | 24 ++ docker/php-official/7.1/baselayout.tar | Bin 0 -> 9601 bytes docker/php-official/7.1/conf/VERSION | 1 + docker/php-official/7.1/conf/bin/bootstrap.sh | 49 +++ docker/php-official/7.1/conf/bin/config.sh | 166 +++++++++ docker/php-official/7.1/conf/bin/control.sh | 170 +++++++++ .../7.1/conf/bin/entrypoint.d/cli.sh | 19 + .../7.1/conf/bin/entrypoint.d/default.sh | 3 + .../7.1/conf/bin/entrypoint.d/noop.sh | 8 + .../7.1/conf/bin/entrypoint.d/root.sh | 14 + .../7.1/conf/bin/entrypoint.d/supervisord.sh | 11 + .../php-official/7.1/conf/bin/entrypoint.sh | 57 +++ docker/php-official/7.1/conf/bin/logwatch.sh | 14 + docker/php-official/7.1/conf/bin/provision | 328 ++++++++++++++++++ docker/php-official/7.1/conf/bin/provision.sh | 30 ++ .../7.1/conf/bin/service.d/cron.d/10-init.sh | 1 + .../7.1/conf/bin/service.d/cron.sh | 7 + .../conf/bin/service.d/dnsmasq.d/10-init.sh | 32 ++ .../7.1/conf/bin/service.d/dnsmasq.sh | 7 + .../conf/bin/service.d/php-fpm.d/10-init.sh | 8 + .../bin/service.d/php-fpm.d/11-clear-env.sh | 38 ++ .../7.1/conf/bin/service.d/php-fpm.sh | 7 + .../conf/bin/service.d/postfix.d/10-init.sh | 24 ++ .../7.1/conf/bin/service.d/postfix.sh | 37 ++ .../7.1/conf/bin/service.d/ssh.d/10-init.sh | 2 + .../7.1/conf/bin/service.d/ssh.sh | 7 + .../bin/service.d/supervisor.d/10-init.sh | 1 + .../7.1/conf/bin/service.d/supervisor.sh | 7 + .../conf/bin/service.d/syslog-ng.d/10-init.sh | 10 + .../7.1/conf/bin/service.d/syslog-ng.sh | 8 + .../7.1/conf/etc/logrotate.d/php5-fpm | 12 + .../7.1/conf/etc/logrotate.d/syslog-ng | 38 ++ .../7.1/conf/etc/php/conf.d/.gitkeep | 0 docker/php-official/7.1/conf/etc/php/php.ini | 1 + .../7.1/conf/etc/php/php.webdevops.ini | 33 ++ .../php-official/7.1/conf/etc/supervisor.conf | 13 + .../7.1/conf/etc/supervisor.d/.gitkeep | 0 .../7.1/conf/etc/supervisor.d/cron.conf | 14 + .../7.1/conf/etc/supervisor.d/dnsmasq.conf | 14 + .../7.1/conf/etc/supervisor.d/php-fpm.conf | 15 + .../7.1/conf/etc/supervisor.d/postfix.conf | 15 + .../7.1/conf/etc/supervisor.d/ssh.conf | 14 + .../7.1/conf/etc/supervisor.d/syslog-ng.conf} | 9 +- .../7.1/conf/etc/syslog-ng/syslog-ng.conf | 48 +++ .../7.1/conf/provision/ansible.cfg | 0 .../7.1/conf/provision/bootstrap.d/.gitkeep | 0 .../7.1/conf/provision/build.d/.gitkeep | 0 .../7.1/conf/provision/build.d/10-cleanup.sh | 6 + .../7.1/conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 2 + .../7.1/conf/provision/onbuild.d/.gitkeep | 0 .../webdevops-base-app/defaults/main.yml | 7 + .../webdevops-base-app/tasks/bootstrap.yml | 7 + .../tasks/bootstrap/application.yml | 10 + .../tasks/bootstrap/dnsmasq.yml | 10 + .../tasks/bootstrap/postfix.yml | 29 ++ .../tasks/bootstrap/ssh.yml | 12 + .../tasks/bootstrap/user.yml | 41 +++ .../roles/webdevops-base-app/tasks/main.yml | 5 + .../roles/webdevops-base/defaults/main.yml | 6 + .../roles/webdevops-base/tasks/bootstrap.yml | 8 + .../webdevops-base/tasks/bootstrap/misc.yml | 8 + .../webdevops-base/tasks/bootstrap/pam.yml | 8 + .../webdevops-base/tasks/bootstrap/root.yml | 5 + .../tasks/bootstrap/supervisor.yml | 6 + .../tasks/bootstrap/syslog-ng.yml | 33 ++ .../webdevops-base/tasks/bootstrap/system.yml | 33 ++ .../roles/webdevops-base/tasks/build.yml | 2 + .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 1 + .../webdevops-base/tasks/entrypoint/.gitkeep | 0 .../roles/webdevops-base/tasks/main.yml | 13 + .../roles/webdevops-cleanup/tasks/cleanup.yml | 16 + .../roles/webdevops-cleanup/tasks/main.yml | 6 + .../roles/webdevops-php/defaults/main.yml | 6 + .../roles/webdevops-php/tasks/bootstrap.yml | 10 + .../webdevops-php/tasks/bootstrap/init.yml | 23 ++ .../tasks/bootstrap/php-fpm.main.yml | 47 +++ .../tasks/bootstrap/php-fpm.pool.yml | 92 +++++ .../webdevops-php/tasks/bootstrap/php-fpm.yml | 9 + .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 11 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 23 ++ .../roles/webdevops-php/tasks/main.yml | 5 + .../conf/provision/variables-webdevops.yml | 7 + .../7.1/conf/provision/variables.yml | 7 + docker/php/5.6/Dockerfile | 6 + docker/php/5.6/Dockerfile.jinja2 | 1 + docker/php/7.0/Dockerfile | 6 + docker/php/7.0/Dockerfile.jinja2 | 1 + docker/php/7.1/Dockerfile | 6 + docker/php/7.1/Dockerfile.jinja2 | 1 + .../conf/bin/service.d/php-fpm.sh | 2 +- .../conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../alpine-3/conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../centos-7/conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- docker/php/debian-7-php7/Dockerfile.disabled | 47 --- .../conf/etc/logrotate.d/php7-fpm | 12 - .../conf/etc/supervisor.d/log-php-slow.conf | 8 - .../conf/etc/supervisor.d/php-fpm.conf | 8 - .../roles/webdevops-php/tasks/bootstrap.yml | 89 ----- .../debian-7/conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../debian-8/conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../debian-9/conf/bin/service.d/php-fpm.sh | 2 +- .../debian-9/conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../conf/bin/service.d/php-fpm.sh | 2 +- .../conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../conf/bin/service.d/php-fpm.sh | 2 +- .../conf/etc/logrotate.d/php7-fpm | 12 - .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 30 +- .../tasks/bootstrap/php-fpm.pool.yml | 79 ++--- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 51 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 +-- .../php/general/bin/service.d/php-fpm.sh | 2 +- .../roles/webdevops-php/tasks/bootstrap.yml | 4 + .../webdevops-php/tasks/bootstrap/init.yml | 71 ++++ .../tasks/bootstrap/php-fpm.main.yml | 35 +- .../tasks/bootstrap/php-fpm.pool.yml | 37 +- .../webdevops-php/tasks/bootstrap/php-fpm.yml | 42 +-- .../tasks/bootstrap/php.alpine.yml | 12 + .../tasks/bootstrap/php.debian.yml | 18 + .../tasks/bootstrap/php.redhat.yml | 12 + .../webdevops-php/tasks/bootstrap/php.yml | 39 --- .../roles/webdevops-php/defaults/main.yml | 6 + .../webdevops-php/tasks/bootstrap/init.yml | 23 ++ .../tasks/bootstrap/php.debian.yml | 11 + .../php/php7/etc/logrotate.d/php7-fpm | 12 - .../webdevops-php/tasks/bootstrap/php-fpm.yml | 54 --- .../webdevops-php/tasks/bootstrap/php.yml | 60 ---- .../php/ubuntu-12.04/bin/service.d/php-fpm.sh | 2 +- template/Dockerfile/images/php.jinja2 | 14 + template/Dockerfile/layout.jinja2 | 1 + 908 files changed, 15801 insertions(+), 2593 deletions(-) create mode 100644 docker/php-apache-dev/5.6/Dockerfile create mode 100644 docker/php-apache-dev/5.6/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-apache-dev/5.6/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/global.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/main.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/php.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh rename docker/{php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev => php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%) create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename docker/{php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev => php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%) create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename docker/{php/debian-7-php7/conf/provision/roles/webdevops-php => php-apache-dev/5.6/conf/provision/roles/webdevops-apache}/tasks/main.yml (100%) create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename docker/{php/debian-7-php7/conf/provision/roles/webdevops-php => php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev}/defaults/main.yml (100%) create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename docker/{php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml => php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml} (91%) rename {provisioning/php/php7/provision/roles/webdevops-php => docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev}/tasks/main.yml (100%) create mode 100644 docker/php-apache-dev/7.0/Dockerfile create mode 100644 docker/php-apache-dev/7.0/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-apache-dev/7.0/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/global.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/main.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/php.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh rename {provisioning/php/php7/provision/roles/webdevops-php => docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%) create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-apache-dev/7.1/Dockerfile create mode 100644 docker/php-apache-dev/7.1/Dockerfile.jinja2 create mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/12-development.sh create mode 100644 docker/php-apache-dev/7.1/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/global.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/main.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/php.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-apache/5.6/Dockerfile create mode 100644 docker/php-apache/5.6/Dockerfile.jinja2 create mode 100644 docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/5.6/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/5.6/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-apache/7.0/Dockerfile create mode 100644 docker/php-apache/7.0/Dockerfile.jinja2 create mode 100644 docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/7.0/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/7.0/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml create mode 100644 docker/php-apache/7.1/Dockerfile create mode 100644 docker/php-apache/7.1/Dockerfile.jinja2 create mode 100644 docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh create mode 100644 docker/php-apache/7.1/conf/bin/service.d/httpd.sh create mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep create mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/global.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/main.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/php.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt create mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr create mode 100644 docker/php-apache/7.1/conf/etc/httpd/ssl/server.key create mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep create mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.conf create mode 100644 docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf create mode 100644 docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml create mode 100644 docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml delete mode 100644 docker/php-dev/debian-7-php7/Dockerfile.disabled delete mode 100644 docker/php-dev/debian-7-php7/Dockerfile.jinja2.disabled create mode 100644 docker/php-nginx-dev/5.6/Dockerfile create mode 100644 docker/php-nginx-dev/5.6/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/5.6/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.0/Dockerfile create mode 100644 docker/php-nginx-dev/7.0/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/7.0/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.1/Dockerfile create mode 100644 docker/php-nginx-dev/7.1/Dockerfile.jinja2 create mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/12-development.sh create mode 100644 docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-nginx-dev/7.1/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx/5.6/Dockerfile create mode 100644 docker/php-nginx/5.6/Dockerfile.jinja2 create mode 100644 docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/5.6/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx/7.0/Dockerfile create mode 100644 docker/php-nginx/7.0/Dockerfile.jinja2 create mode 100644 docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/7.0/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-nginx/7.1/Dockerfile create mode 100644 docker/php-nginx/7.1/Dockerfile.jinja2 create mode 100644 docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh create mode 100644 docker/php-nginx/7.1/conf/bin/service.d/nginx.sh create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/global.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/main.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/php.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.conf create mode 100644 docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf create mode 100644 docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml create mode 100644 docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml create mode 100644 docker/php-official/5.6/Dockerfile create mode 100644 docker/php-official/5.6/Dockerfile.jinja2 create mode 100644 docker/php-official/5.6/baselayout.tar create mode 100644 docker/php-official/5.6/conf/VERSION create mode 100644 docker/php-official/5.6/conf/bin/bootstrap.sh create mode 100644 docker/php-official/5.6/conf/bin/config.sh create mode 100644 docker/php-official/5.6/conf/bin/control.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/5.6/conf/bin/entrypoint.sh create mode 100644 docker/php-official/5.6/conf/bin/logwatch.sh create mode 100755 docker/php-official/5.6/conf/bin/provision create mode 100644 docker/php-official/5.6/conf/bin/provision.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/etc/php/php.ini create mode 100644 docker/php-official/5.6/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/5.6/conf/etc/supervisor.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf rename docker/{php/debian-7-php7/conf/etc/supervisor.d/log-php-access.conf => php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf} (50%) create mode 100644 docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/5.6/conf/provision/ansible.cfg create mode 100644 docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/defaults/main.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/main.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/defaults/main.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/main.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/main.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/defaults/main.yml rename {provisioning/php/php7 => docker/php-official/5.6/conf}/provision/roles/webdevops-php/tasks/bootstrap.yml (50%) create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml rename {provisioning/php/php7 => docker/php-official/5.6/conf}/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml (60%) rename {provisioning/php/php7 => docker/php-official/5.6/conf}/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml (54%) create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/main.yml create mode 100644 docker/php-official/5.6/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/5.6/conf/provision/variables.yml create mode 100644 docker/php-official/7.0/Dockerfile create mode 100644 docker/php-official/7.0/Dockerfile.jinja2 create mode 100644 docker/php-official/7.0/baselayout.tar create mode 100644 docker/php-official/7.0/conf/VERSION create mode 100644 docker/php-official/7.0/conf/bin/bootstrap.sh create mode 100644 docker/php-official/7.0/conf/bin/config.sh create mode 100644 docker/php-official/7.0/conf/bin/control.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/7.0/conf/bin/entrypoint.sh create mode 100644 docker/php-official/7.0/conf/bin/logwatch.sh create mode 100755 docker/php-official/7.0/conf/bin/provision create mode 100644 docker/php-official/7.0/conf/bin/provision.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/etc/php/php.ini create mode 100644 docker/php-official/7.0/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/7.0/conf/etc/supervisor.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf rename docker/{php/debian-7-php7/conf/etc/supervisor.d/log-php-error.conf => php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf} (50%) create mode 100644 docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/7.0/conf/provision/ansible.cfg create mode 100644 docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/defaults/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/defaults/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/defaults/main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/main.yml create mode 100644 docker/php-official/7.0/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/7.0/conf/provision/variables.yml create mode 100644 docker/php-official/7.1/Dockerfile create mode 100644 docker/php-official/7.1/Dockerfile.jinja2 create mode 100644 docker/php-official/7.1/baselayout.tar create mode 100644 docker/php-official/7.1/conf/VERSION create mode 100644 docker/php-official/7.1/conf/bin/bootstrap.sh create mode 100644 docker/php-official/7.1/conf/bin/config.sh create mode 100644 docker/php-official/7.1/conf/bin/control.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/default.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/root.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh create mode 100644 docker/php-official/7.1/conf/bin/entrypoint.sh create mode 100644 docker/php-official/7.1/conf/bin/logwatch.sh create mode 100755 docker/php-official/7.1/conf/bin/provision create mode 100644 docker/php-official/7.1/conf/bin/provision.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/cron.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/php-fpm.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/postfix.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/ssh.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/supervisor.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh create mode 100644 docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh create mode 100644 docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm create mode 100644 docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng create mode 100644 docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/etc/php/php.ini create mode 100644 docker/php-official/7.1/conf/etc/php/php.webdevops.ini create mode 100644 docker/php-official/7.1/conf/etc/supervisor.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/cron.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf rename docker/{php/debian-7-php7/conf/etc/supervisor.d/log-php-fpm.conf => php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf} (50%) create mode 100644 docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf create mode 100644 docker/php-official/7.1/conf/provision/ansible.cfg create mode 100644 docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/build.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh create mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh create mode 100644 docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/defaults/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/defaults/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/defaults/main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/main.yml create mode 100644 docker/php-official/7.1/conf/provision/variables-webdevops.yml create mode 100644 docker/php-official/7.1/conf/provision/variables.yml create mode 100644 docker/php/5.6/Dockerfile create mode 100644 docker/php/5.6/Dockerfile.jinja2 create mode 100644 docker/php/7.0/Dockerfile create mode 100644 docker/php/7.0/Dockerfile.jinja2 create mode 100644 docker/php/7.1/Dockerfile create mode 100644 docker/php/7.1/Dockerfile.jinja2 delete mode 100644 docker/php/alpine-3-php7/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/centos-7-php7/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/debian-7-php7/Dockerfile.disabled delete mode 100644 docker/php/debian-7-php7/conf/etc/logrotate.d/php7-fpm delete mode 100644 docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-slow.conf delete mode 100644 docker/php/debian-7-php7/conf/etc/supervisor.d/php-fpm.conf delete mode 100644 docker/php/debian-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml create mode 100644 docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/debian-8-php7/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/debian-9/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/ubuntu-16.04/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml delete mode 100644 docker/php/ubuntu-16.10/conf/etc/logrotate.d/php7-fpm create mode 100644 docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml create mode 100644 provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml create mode 100644 provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml create mode 100644 provisioning/php/official/provision/roles/webdevops-php/defaults/main.yml create mode 100644 provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml create mode 100644 provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml delete mode 100644 provisioning/php/php7/etc/logrotate.d/php7-fpm delete mode 100644 provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml delete mode 100644 provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php.yml create mode 100644 template/Dockerfile/images/php.jinja2 diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index ccf319f95..609843483 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -170,7 +170,9 @@ def generate_serverspec_configuration(path, dockerfile, configuration, is_toolim if image_env_list: image_env_list = image_env_list.to_dict().copy() for term in image_env_list: - if term in dockerfile['image']['fullname']: + regex = r'.*%s.*' % term + match = re.match(regex, dockerfile['image']['fullname'], re.IGNORECASE) + if match: for key in image_env_list[term]: ret[key] = str(image_env_list[term][key]) diff --git a/conf/console.yml b/conf/console.yml index 421671505..d27561cfe 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -58,6 +58,9 @@ dockerTest: ':centos-7-php56': PHP_APCU: '0' PHP_REDIS: '0' + 'php[^:]*:[0-9]': + OS_FAMILY: 'debian' + OS_VERSION: '8' '/liquibase': OS_FAMILY: 'alpine' OS_VERSION: '3' diff --git a/conf/provision.yml b/conf/provision.yml index cec30b1d7..16909724f 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -40,15 +40,9 @@ provision: hhvm-nginx/general: '*' php: configuration: - php/general : '*' + php/general : '(debian|ubuntu|centos|alpine)' php/ubuntu-12.04 : ubuntu-12.04 php/alpine : alpine-* - # deploy php7 configuration to *-php7 containers - php/php7 : - - '*-php7' - - debian-9 - - ubuntu-16.04 - - ubuntu-16.10 php-apache: configuration: apache/general : '*' @@ -81,6 +75,13 @@ provision: php-nginx/general : '*' php-dev/general : '*' nginx-dev/general : '*' + php-official: + baselayout: on + configuration: + base/general : '*' + base-app/general : '*' + php/general : '*' + php/official : '*' postfix: configuration: postfix/general : '*' diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile new file mode 100644 index 000000000..f3240a495 --- /dev/null +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -0,0 +1,35 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:5.6 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/Dockerfile.jinja2 b/docker/php-apache-dev/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..c097cd6b5 --- /dev/null +++ b/docker/php-apache-dev/5.6/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "5.6") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache apache-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# 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 + +LogLevel info diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/global.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/main.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/5.6/conf/etc/httpd/php.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +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" + + diff --git a/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/5.6/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/5.6/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php/debian-7-php7/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php/debian-7-php7/conf/provision/roles/webdevops-php/tasks/main.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache-dev/5.6/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/debian-7-php7/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php/debian-7-php7/conf/provision/roles/webdevops-php/defaults/main.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/5.6/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/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/5.6/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/5.6/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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml similarity index 91% rename from docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml index 9d1d85a8c..c49cb0e34 100644 --- a/docker/php-dev/debian-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml @@ -1,7 +1,7 @@ --- - name: Downloading Tools - get_url: url={{ item.url }} dest={{ item.dest }} mode=0755 + 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 } @@ -20,4 +20,4 @@ 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" } \ No newline at end of file + - { package: "phpspec/phpspec" , version: "~2.0" } diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/main.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from provisioning/php/php7/provision/roles/webdevops-php/tasks/main.yml rename to docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile new file mode 100644 index 000000000..c9374a324 --- /dev/null +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -0,0 +1,35 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:7.0 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache-dev/7.0/Dockerfile.jinja2 b/docker/php-apache-dev/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..ffc16f8af --- /dev/null +++ b/docker/php-apache-dev/7.0/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "7.0") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache apache-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# 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 + +LogLevel info diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/global.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/main.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/7.0/conf/etc/httpd/php.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +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" + + diff --git a/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/7.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/7.0/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/provisioning/php/php7/provision/roles/webdevops-php/defaults/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from provisioning/php/php7/provision/roles/webdevops-php/defaults/main.yml rename to docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/7.0/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/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/7.0/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/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.0/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/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile new file mode 100644 index 000000000..03259a0dd --- /dev/null +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -0,0 +1,35 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache-dev:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:7.1 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache-dev/7.1/Dockerfile.jinja2 b/docker/php-apache-dev/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..3e883d3e4 --- /dev/null +++ b/docker/php-apache-dev/7.1/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "7.1") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache apache-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/12-development.sh new file mode 100644 index 000000000..a9d2c6e92 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.d/12-development.sh @@ -0,0 +1,5 @@ +go-replace \ + -s "" -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf new file mode 100644 index 000000000..75e5f4396 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/02-dev.conf @@ -0,0 +1,8 @@ +# 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 + +LogLevel info diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/global.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/main.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/7.1/conf/etc/httpd/php.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..54918ec2b --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.common.d/02-dev.conf @@ -0,0 +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" + + diff --git a/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/7.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/7.1/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-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/7.1/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/7.1/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/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/7.1/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/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-apache-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile new file mode 100644 index 000000000..5a9baa0d8 --- /dev/null +++ b/docker/php-apache/5.6/Dockerfile @@ -0,0 +1,34 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:5.6 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..f0626df68 --- /dev/null +++ b/docker/php-apache/5.6/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "5.6") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache/5.6/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/5.6/conf/bin/service.d/httpd.sh b/docker/php-apache/5.6/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache/5.6/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/5.6/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/global.conf b/docker/php-apache/5.6/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/5.6/conf/etc/httpd/main.conf b/docker/php-apache/5.6/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/5.6/conf/etc/httpd/php.conf b/docker/php-apache/5.6/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/ssl/server.csr b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/ssl/server.key b/docker/php-apache/5.6/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/vhost.common.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/5.6/conf/etc/httpd/vhost.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/5.6/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/5.6/conf/etc/supervisor.d/apache.conf b/docker/php-apache/5.6/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache/5.6/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/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache/5.6/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/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile new file mode 100644 index 000000000..810ca60ee --- /dev/null +++ b/docker/php-apache/7.0/Dockerfile @@ -0,0 +1,34 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.0 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..aad741346 --- /dev/null +++ b/docker/php-apache/7.0/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "7.0") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache/7.0/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/7.0/conf/bin/service.d/httpd.sh b/docker/php-apache/7.0/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache/7.0/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.0/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/global.conf b/docker/php-apache/7.0/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/7.0/conf/etc/httpd/main.conf b/docker/php-apache/7.0/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/7.0/conf/etc/httpd/php.conf b/docker/php-apache/7.0/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/7.0/conf/etc/httpd/vhost.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/7.0/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/7.0/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.0/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache/7.0/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/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache/7.0/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/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile new file mode 100644 index 000000000..463c180b5 --- /dev/null +++ b/docker/php-apache/7.1/Dockerfile @@ -0,0 +1,34 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-apache:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.1 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install apache +RUN /usr/local/bin/apt-install \ + apache2 \ + apache2-mpm-worker \ + && 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/apache2/apache2.conf \ + && rm -f /etc/apache2/sites-enabled/* \ + && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..605ec8b16 --- /dev/null +++ b/docker/php-apache/7.1/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "7.1") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.debian8('php-apache') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh new file mode 100644 index 000000000..b9d57997e --- /dev/null +++ b/docker/php-apache/7.1/conf/bin/service.d/httpd.d/10-init.sh @@ -0,0 +1,21 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/httpd/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/httpd/conf.d/10-php.conf +fi diff --git a/docker/php-apache/7.1/conf/bin/service.d/httpd.sh b/docker/php-apache/7.1/conf/bin/service.d/httpd.sh new file mode 100644 index 000000000..03eec305a --- /dev/null +++ b/docker/php-apache/7.1/conf/bin/service.d/httpd.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/httpd.d/" + +# Apache gets grumpy about PID files pre-existing +rm -f /var/run/apache2/apache2*.pid + +source /etc/apache2/envvars +exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-error-document.conf new file mode 100644 index 000000000..ebabf87e4 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf new file mode 100644 index 000000000..ef0c73d38 --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-log.conf @@ -0,0 +1,4 @@ +LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog +LogLevel warn +CustomLog /docker.stdout dockerlog +ErrorLog /docker.stderr diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf new file mode 100644 index 000000000..4368d12ef --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-php.conf @@ -0,0 +1,37 @@ +############################# +# mod_proxy_fcgi +# official solution +# apache 2.4 and later +############################# + + + > + ProxySet connectiontimeout=5 timeout=600 + + + + SetHandler "proxy:fcgi://" + + + +############################# +# mod_fastcgi +# apaache 2.2 and 2.4 +############################# + + + AddHandler php-fcgi .php + Action php-fcgi /php-fcgi + Alias /php-fcgi /usr/lib/cgi-bin/php-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php-fcgi -host "" -pass-header Authorization -idle-timeout 600 + + + + Allow from all + + = 2.4> + Require all granted + + + + diff --git a/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/7.1/conf/etc/httpd/conf.d/10-server.conf new file mode 100644 index 000000000..d3a5defbd --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/global.conf b/docker/php-apache/7.1/conf/etc/httpd/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/7.1/conf/etc/httpd/main.conf b/docker/php-apache/7.1/conf/etc/httpd/main.conf new file mode 100644 index 000000000..12251c222 --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/main.conf @@ -0,0 +1,12 @@ +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/7.1/conf/etc/httpd/php.conf b/docker/php-apache/7.1/conf/etc/httpd/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/ssl/server.csr b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/ssl/server.key b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.conf new file mode 100644 index 000000000..384696b4e --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/vhost.common.d/01-boilerplate.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-apache/7.1/conf/etc/httpd/vhost.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.conf new file mode 100644 index 000000000..c04a94318 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf new file mode 100644 index 000000000..cf5fbc604 --- /dev/null +++ b/docker/php-apache/7.1/conf/etc/httpd/vhost.ssl.conf @@ -0,0 +1,26 @@ + ############ + # 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 + 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/7.1/conf/etc/supervisor.d/apache.conf b/docker/php-apache/7.1/conf/etc/supervisor.d/apache.conf new file mode 100644 index 000000000..12a6f86f7 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..4df3436ce --- /dev/null +++ b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -0,0 +1,156 @@ +--- + +- name: Set apache vhost file [RedHat family] + set_fact: + apache_main_path: /etc/httpd/ + apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf + when: ansible_os_family == 'RedHat' + +- name: Set apache vhost file [Debian family] + set_fact: + apache_main_path: /etc/apache2/ + 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_main_path: /etc/apache2/ + apache_docker_vhost: /etc/apache2/conf.d/zzz-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: Find apache2 files + shell: "find '{{ apache_main_path }}' -type f -iname '*.conf' -o -iname 'default*' -o -iname '*log'" + register: apache2_conf_files + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*CustomLog ([^\s]+)(.*)' + replace: 'CustomLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change CustomLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*ErrorLog ([^\s]+)(.*)' + replace: 'ErrorLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- name: Change TransferLog to Docker stdout + replace: + dest: '{{ item }}' + regexp: '^[\s]*TransferLog ([^\s]+)(.*)' + replace: 'TransferLog /docker.stdout \2' + with_items: "{{ apache2_conf_files.stdout_lines }}" + +- 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 dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|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: Remove default vhost from ssl configuration [Alpine family] + command: sed -i -e '1h;2,$H;$!d;g' -e 's//#-> removed vhost/g' /etc/apache2/conf.d/ssl.conf + 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' } + +- name: Maintain lock directory [Debian family] + file: + path: "/var/lock/apache2" + state: "directory" + mode: "0750" + owner: "www-data" + group: "www-data" + when: ansible_os_family == 'Debian' diff --git a/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml new file mode 100644 index 000000000..ad5fb2121 --- /dev/null +++ b/docker/php-apache/7.1/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/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-php-apache/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-apache/7.1/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/debian-7-php7/Dockerfile.disabled b/docker/php-dev/debian-7-php7/Dockerfile.disabled deleted file mode 100644 index c4ba1392e..000000000 --- a/docker/php-dev/debian-7-php7/Dockerfile.disabled +++ /dev/null @@ -1,26 +0,0 @@ -#++++++++++++++++++++++++++++++++++++++ -# Debian 7 PHP Docker container -#++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-7 -MAINTAINER info@webdevops.io - -ENV WEB_DOCUMENT_ROOT /app - -# Install dotdeb -RUN echo "deb http://packages.dotdeb.org wheezy all" >> /etc/apt/sources.list \ - && echo "deb-src http://packages.dotdeb.org wheezy all" >> /etc/apt/sources.list \ - && wget wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add - - -# Install tools -RUN /usr/local/bin/apt-install \ - imagemagick \ - graphviz - -COPY conf/ /opt/docker/ -RUN bash /opt/docker/bin/control.sh provision.role.bootstrap webdevops-php-dev \ - && bash /opt/docker/bin/bootstrap.sh - -EXPOSE 9000 - -CMD ["supervisord"] diff --git a/docker/php-dev/debian-7-php7/Dockerfile.jinja2.disabled b/docker/php-dev/debian-7-php7/Dockerfile.jinja2.disabled deleted file mode 100644 index 95f9f7b47..000000000 --- a/docker/php-dev/debian-7-php7/Dockerfile.jinja2.disabled +++ /dev/null @@ -1,7 +0,0 @@ -{{ docker.from("php", "debian-7-php7") }} - -{{ docker.version() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -{{ php7dev.debian() }} diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile new file mode 100644 index 000000000..caaedde58 --- /dev/null +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:5.6 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..8c57cc39c --- /dev/null +++ b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "5.6") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx nginx-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/global.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/main.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/etc/nginx/php.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx-dev/5.6/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-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/5.6/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/5.6/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/5.6/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-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/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-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/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/5.6/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/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/5.6/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/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx-dev/5.6/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-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile new file mode 100644 index 000000000..5dddaf877 --- /dev/null +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:7.0 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..d5b15151d --- /dev/null +++ b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "7.0") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx nginx-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/global.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/main.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/etc/nginx/php.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx-dev/7.0/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-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/7.0/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/7.0/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/7.0/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-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/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-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/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/7.0/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/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/7.0/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/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx-dev/7.0/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-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile new file mode 100644 index 000000000..985deed7e --- /dev/null +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -0,0 +1,28 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-dev:7.1 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..3b82f0193 --- /dev/null +++ b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("php-dev", "7.1") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx nginx-dev php-dev') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/12-development.sh new file mode 100644 index 000000000..f4695f059 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.d/12-development.sh @@ -0,0 +1,7 @@ +go-replace \ + -s "" \ + -r "$WEB_NO_CACHE_PATTERN" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + diff --git a/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/02-dev.conf @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/global.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/main.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/etc/nginx/php.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf new file mode 100644 index 000000000..4f80ec9d3 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/02-dev.conf @@ -0,0 +1,6 @@ +location ~* { + expires off; + add_header Cache-Control private; + + try_files $uri $uri/ /?$query_string; +} diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx-dev/7.1/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-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..a2cd929e7 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr info; diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/7.1/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +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/7.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/7.1/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-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/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..3e783736c --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml @@ -0,0 +1,3 @@ +--- + +- include: bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml new file mode 100644 index 000000000..8075b2d9d --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-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/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/7.1/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/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/7.1/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/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx-dev/7.1/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/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile new file mode 100644 index 000000000..e170617c0 --- /dev/null +++ b/docker/php-nginx/5.6/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:5.6 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..96a6a1152 --- /dev/null +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "5.6") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx/5.6/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh b/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx/5.6/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/global.conf b/docker/php-nginx/5.6/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/5.6/conf/etc/nginx/main.conf b/docker/php-nginx/5.6/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/nginx/php.conf b/docker/php-nginx/5.6/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/nginx/ssl/server.key b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/5.6/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx/5.6/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx/5.6/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/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/5.6/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx/5.6/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/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile new file mode 100644 index 000000000..7b93594eb --- /dev/null +++ b/docker/php-nginx/7.0/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.0 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..63820afec --- /dev/null +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "7.0") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx/7.0/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx/7.0/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/global.conf b/docker/php-nginx/7.0/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/7.0/conf/etc/nginx/main.conf b/docker/php-nginx/7.0/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/nginx/php.conf b/docker/php-nginx/7.0/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/ssl/server.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.0/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx/7.0/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/7.0/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx/7.0/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/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile new file mode 100644 index 000000000..937b64d0f --- /dev/null +++ b/docker/php-nginx/7.1/Dockerfile @@ -0,0 +1,27 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.1 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.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/ + +# Install nginx +RUN /usr/local/bin/apt-install \ + nginx \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..42fff3a43 --- /dev/null +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "7.1") }} + +{{ docker.version() }} + +{{ environment.web() }} +{{ environment.webPhp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ nginx.debian('php-nginx') }} + +{{ docker.expose('80 443') }} diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh new file mode 100644 index 000000000..27b9776cc --- /dev/null +++ b/docker/php-nginx/7.1/conf/bin/service.d/nginx.d/10-init.sh @@ -0,0 +1,25 @@ +if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then + echo "" + echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!" + echo "" +fi + +# Prevent startup of nginx (ubuntu 16.04 needs it) +ln -f -s /var/lib/nginx/logs /var/log/nginx + +# Replace markers +go-replace \ + -s "" -r "$WEB_DOCUMENT_INDEX" \ + -s "" -r "$WEB_DOCUMENT_ROOT" \ + -s "" -r "$WEB_ALIAS_DOMAIN" \ + -s "" -r "$HOSTNAME" \ + -s "" -r "$WEB_PHP_SOCKET" \ + --path=/opt/docker/etc/nginx/ \ + --path-pattern='*.conf' \ + --ignore-empty + +if [[ -z "${WEB_PHP_SOCKET+x}" ]]; then + ## WEB_PHP_SOCKET is not set, remove PHP files + rm -f -- /opt/docker/etc/nginx/conf.d/10-php.conf + rm -f -- /opt/docker/etc/nginx/vhost.common.d/10-php.conf +fi diff --git a/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh b/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh new file mode 100644 index 000000000..f5cd26167 --- /dev/null +++ b/docker/php-nginx/7.1/conf/bin/service.d/nginx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/nginx.d/" + +exec /usr/sbin/nginx diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf new file mode 100644 index 000000000..9abe45f0a --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/conf.d/10-php.conf @@ -0,0 +1,3 @@ +upstream php { + server ; +} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/global.conf b/docker/php-nginx/7.1/conf/etc/nginx/global.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/global.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/7.1/conf/etc/nginx/main.conf b/docker/php-nginx/7.1/conf/etc/nginx/main.conf new file mode 100644 index 000000000..06de0651b --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/php.conf b/docker/php-nginx/7.1/conf/etc/nginx/php.conf new file mode 100644 index 000000000..b6141db09 --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/php.conf @@ -0,0 +1 @@ +# deprecated diff --git a/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.crt new file mode 100644 index 000000000..6b0694907 --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.csr new file mode 100644 index 000000000..8a9909f77 --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/ssl/server.key b/docker/php-nginx/7.1/conf/etc/nginx/ssl/server.key new file mode 100644 index 000000000..c9eec145f --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.conf new file mode 100644 index 000000000..a5df62ef8 --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf new file mode 100644 index 000000000..d3fd0aa5e --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-general.conf @@ -0,0 +1 @@ +client_max_body_size 50m; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-location-root.conf new file mode 100644 index 000000000..28fd811bc --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf new file mode 100644 index 000000000..9646c6826 --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-log.conf @@ -0,0 +1,2 @@ +access_log /docker.stdout; +error_log /docker.stderr warn; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf new file mode 100644 index 000000000..274beac87 --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.common.d/10-php.conf @@ -0,0 +1,7 @@ +location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_read_timeout 1000; +} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf new file mode 100644 index 000000000..8225f314a --- /dev/null +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf @@ -0,0 +1,26 @@ +server { + listen 80 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; +} + +############## +# SSL +############## + +server { + listen 443 default_server; + + server_name _ docker; + + root ""; + index ; + + include /opt/docker/etc/nginx/vhost.common.d/*.conf; + include /opt/docker/etc/nginx/vhost.ssl.conf; +} diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf new file mode 100644 index 000000000..4ddba251d --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/7.1/conf/etc/supervisor.d/nginx.conf new file mode 100644 index 000000000..657bf499b --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/defaults/main.yml new file mode 100644 index 000000000..69cba1cb4 --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..7edb04ee4 --- /dev/null +++ b/docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml @@ -0,0 +1,86 @@ +--- + +- 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: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*access_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- name: Set access_log to stdout + replace: + dest: /etc/nginx/nginx.conf + regexp: '^([ \t]*error_log)[ \t]*([^\t ;]+)(.*;)$' + replace: '\1 /docker.stdout \3' + +- 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: "{{ item }}" + state: absent + with_items: + # Debian family + - "/etc/nginx/sites-enabled/default" + # Alpine + - "/etc/nginx/conf.d/default.conf" + + +- name: Replace default nginx.conf [RedHat/Alpine family] + file: + 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: Remove old log directory + file: + path: "/var/lib/nginx/logs" + state: absent + +- name: Create log directory + file: + path: "/var/lib/nginx/logs" + state: directory + +- name: Create stdout symlinks + file: + dest: "{{ item }}" + src: "/docker.stdout" + state: link + force: yes + with_items: + - "/var/lib/nginx/logs/access.log" + - "/var/lib/nginx/logs/error.log" + +- 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/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-nginx/7.1/conf/provision/roles/webdevops-nginx/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/defaults/main.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml new file mode 100644 index 000000000..a2866e0d0 --- /dev/null +++ b/docker/php-nginx/7.1/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/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/7.1/conf/provision/roles/webdevops-php-nginx/tasks/main.yml new file mode 100644 index 000000000..7895a52a9 --- /dev/null +++ b/docker/php-nginx/7.1/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-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile new file mode 100644 index 000000000..0a229407c --- /dev/null +++ b/docker/php-official/5.6/Dockerfile @@ -0,0 +1,146 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM php:5.6-fpm + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +ENV TERM "xterm" +ENV LANG "en_US.UTF-8" +ENV LC_ALL "en_US.UTF-8" +ENV APPLICATION_USER application +ENV APPLICATION_GROUP application +ENV APPLICATION_PATH /app +ENV APPLICATION_UID 1000 +ENV APPLICATION_GID 1000 + +ADD baselayout.tar / + +COPY conf/ /opt/docker/ + +# Init bootstrap +RUN set -x \ + # Fix root terminal + && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && /usr/local/bin/apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + # Generate base locale + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + ## Install go-replace + && GOREPLACE_VERSION=0.5.2 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ + && apt-get purge -y -f --force-yes wget dirmngr \ + && /usr/local/bin/docker-image-cleanup + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + +# Install packages +RUN chmod +x /opt/docker/bin/* \ + && /usr/local/bin/apt-install \ + python-minimal \ + supervisor \ + syslog-ng \ + syslog-ng-core \ + cron \ + wget \ + curl \ + net-tools \ + gnupg \ + && chmod +s /usr/local/bin/gosu \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install services +RUN /usr/local/bin/apt-install \ + # Install services + openssh-server \ + mysql-client \ + sqlite \ + dnsmasq \ + postfix \ + # Install common tools + sudo \ + zip \ + unzip \ + bzip2 \ + wget \ + curl \ + net-tools \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + nano \ + vim \ + && /usr/local/bin/generate-locales \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install php environment +RUN /usr/local/bin/apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + && 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 \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 9000 +ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] +CMD ["supervisord"] diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..0fce26dea --- /dev/null +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -0,0 +1,24 @@ +{{ docker.fromOfficial("php", "5.6-fpm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.app() }} + +{{ docker.add('baselayout.tar', '/') }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ bootstrap.debian('jessie') }} + +{{ ansible.debian() }} + +{{ base.debian() }} + +{{ baseapp.debian() }} + +{{ php.official() }} + +{{ docker.expose('9000') }} +{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/5.6/baselayout.tar b/docker/php-official/5.6/baselayout.tar new file mode 100644 index 0000000000000000000000000000000000000000..68905af7cf1a630e80bb2ca12671b637419715c9 GIT binary patch literal 9601 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 r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?P /opt/docker/BUILDTIME + +# Make all scripts executable +find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x + + +case "$BOOTSTRAP_MODE" in + ################################### + # When container will be build next time + ################################### + "onbuild") + # Init and run bootstrap system + runProvisionOnBuild + ;; + + ################################### + # When container is build this time + ################################### + "bootstrap") + # Init and run bootstrap system + runProvisionBootstrap + runProvisionBuild + ;; + + *) + echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" + exit 1 + ;; + +esac + diff --git a/docker/php-official/5.6/conf/bin/config.sh b/docker/php-official/5.6/conf/bin/config.sh new file mode 100644 index 000000000..3155728e8 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/config.sh @@ -0,0 +1,166 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create named pipe + # + # $1 -> name of file + # + ## +function createNamedPipe() { + rm --force -- "$1" + mknod "$1" p +} + +### + # Escape value for sed usage + # + # $1 -> value + # STDOUT -> escaped value + # + ## +function sedEscape() { + echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" +} + +### + # Replace text inside a file + # + # $1 -> source value + # $2 -> target value + # $3 -> path to file + # + ## +function replaceTextInFile() { + SOURCE="$(sedEscape $1)" + REPLACE="$(sedEscape $2)" + TARGET="$3" + + sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" +} + + +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit +} + +### + # Run "bootstrap" provisioning + ## +function runProvisionBootstrap() { + for FILE in /opt/docker/provision/bootstrap.d/*.sh; do + # run custom scripts, only once + . "$FILE" + rm -f -- "$FILE" + done + + runDockerProvision bootstrap +} + +### + # Run "build" provisioning + ## +function runProvisionBuild() { + for FILE in /opt/docker/provision/build.d/*.sh; do + # run custom scripts, only once + . "$FILE" + done + + runDockerProvision build +} + +### + # Run "onbuild" provisioning + ## +function runProvisionOnBuild() { + includeScriptDir "/opt/docker/provision/onbuild.d" + + runDockerProvision onbuild +} + +### + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" + + runDockerProvision entrypoint +} + + +### + # Run docker provisioning with dyniamic playbook generation + # + # $1 -> playbook tag (bootstrap, onbuild, entrypoint) + # + ## +function runDockerProvision() { + ANSIBLE_TAG="$1" + + /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry +} + diff --git a/docker/php-official/5.6/conf/bin/control.sh b/docker/php-official/5.6/conf/bin/control.sh new file mode 100644 index 000000000..a6697092d --- /dev/null +++ b/docker/php-official/5.6/conf/bin/control.sh @@ -0,0 +1,170 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + "service.disable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..2ca68926c --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..967920837 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +tail -f /dev/null +exit diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..ead991551 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +rootCheck "supervisord" + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/5.6/conf/bin/entrypoint.sh b/docker/php-official/5.6/conf/bin/entrypoint.sh new file mode 100644 index 000000000..169a4bb88 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/entrypoint.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# link stdout from docker +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr +chmod 600 /docker.stdout /docker.stderr + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/5.6/conf/bin/logwatch.sh b/docker/php-official/5.6/conf/bin/logwatch.sh new file mode 100644 index 000000000..1a5b486c7 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/logwatch.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +sleep 0.5 + +if [ -p "$2" ]; then + sed --unbuffered -e "s/^/\[$1\] /" -- "$2" +else + tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" +fi diff --git a/docker/php-official/5.6/conf/bin/provision b/docker/php-official/5.6/conf/bin/provision new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/provision @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/5.6/conf/bin/provision.sh b/docker/php-official/5.6/conf/bin/provision.sh new file mode 100644 index 000000000..4079dd7f0 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/provision.sh @@ -0,0 +1,30 @@ + #!/usr/bin/env bash + +# +# Example: +# provision.sh /opt/foobar/playbook.yml tag +# +# + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +. config.sh + +deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" + + +if [ "$#" -lt 2 ]; then + echo "[ERROR] $0: Playbook or tag is missing" + exit 1 +fi + +ANSIBLE_PLAYBOOK="$1" +shift +ANSIBLE_TAG="$1" +shift +ANSIBLE_OPTS="$@" + +/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/5.6/conf/bin/service.d/cron.sh b/docker/php-official/5.6/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..9bf7c10bf --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/cron.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f diff --git a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..03baba08f --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,32 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +## clear dns file +echo > /etc/dnsmasq.d/webdevops + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops + done +fi diff --git a/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..d16b1acbc --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..312fcd043 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,8 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..8bfb3c036 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# 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 +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty + diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..b25983bd3 --- /dev/null +++ b/docker/php-official/5.6/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/local/bin/php-fpm --nodaemonize diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..7a604874f --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,24 @@ +# force new copy of hosts there (otherwise links could be outdated) +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 + +## MYHOSTNAME +# replace line +sed -i '/myhostname[ ]* =/c\' main.cf +echo "myhostname = $(hostname)" >> /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + # replace line + sed -i '/relayhost[ ]* =/c\' main.cf + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + # replace line + sed -i '/mynetworks[ ]* =/c\' main.cf + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..3ab608679 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/postfix.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +while kill -0 "$(cat /var/spool/postfix/pid/master.pid)"; do + sleep 5 +done diff --git a/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..e3192fe01 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,2 @@ +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/5.6/conf/bin/service.d/ssh.sh b/docker/php-official/5.6/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..ad855563f --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/ssh.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D diff --git a/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/5.6/conf/bin/service.d/supervisor.sh b/docker/php-official/5.6/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..b1741955a --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/supervisor.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user root diff --git a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..09d1730ba --- /dev/null +++ b/docker/php-official/5.6/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS diff --git a/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm b/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/5.6/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-official/5.6/conf/etc/logrotate.d/syslog-ng b/docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/5.6/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep b/docker/php-official/5.6/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/etc/php/php.ini b/docker/php-official/5.6/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini b/docker/php-official/5.6/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..562b8d7e2 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/php/php.webdevops.ini @@ -0,0 +1,33 @@ +; ------------------------------------- +; 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.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/5.6/conf/etc/supervisor.conf b/docker/php-official/5.6/conf/etc/supervisor.conf new file mode 100644 index 000000000..7c109515a --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.conf @@ -0,0 +1,13 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep b/docker/php-official/5.6/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf b/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..a0ad2de88 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.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-official/5.6/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.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-official/5.6/conf/etc/supervisor.d/postfix.conf b/docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf b/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-access.conf b/docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf similarity index 50% rename from docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-access.conf rename to docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf index b70effa7a..247fd1a25 100644 --- a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-access.conf +++ b/docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf @@ -1,5 +1,10 @@ -[program:log-php-access] -command = bash /opt/docker/bin/logwatch.sh php:access /var/log/php7-fpm/access.log +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s autostart = true autorestart = true stdout_logfile=/dev/stdout diff --git a/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/5.6/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/5.6/conf/provision/ansible.cfg b/docker/php-official/5.6/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/5.6/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/build.d/.gitkeep b/docker/php-official/5.6/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh b/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..20fbdc841 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/5.6/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep b/docker/php-official/5.6/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/defaults/main.yml new file mode 100644 index 000000000..e10ef7d38 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_PATH: "{{ lookup('env','APPLICATION_PATH') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml new file mode 100644 index 000000000..ea9e54682 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -0,0 +1,7 @@ +--- + +- include: bootstrap/user.yml +- include: bootstrap/application.yml +- include: bootstrap/dnsmasq.yml +- include: bootstrap/postfix.yml +- include: bootstrap/ssh.yml diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml new file mode 100644 index 000000000..faddb6027 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml @@ -0,0 +1,10 @@ +--- + +- name: Init application directory + file: + path: "/{{ APPLICATION_PATH }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml new file mode 100644 index 000000000..962a7953a --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml @@ -0,0 +1,10 @@ +--- + +- name: Configure dnsmasq + lineinfile: + dest: /etc/dnsmasq.conf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'user', value: 'root' } + - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml new file mode 100644 index 000000000..f05ff660c --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml @@ -0,0 +1,29 @@ +--- + +- name: Link aliases file to postfix aliases + file: + src: '/etc/postfix/aliases' + dest: '/etc/aliases' + state: link + force: yes + when: ansible_os_family == 'Alpine' + +- name: Configure postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'mydestination', value: '' } + - { key: 'message_size_limit', value: '15240000' } + # Hardening + - { key: 'smtp_use_tls', value: 'yes' } + - { key: 'smtp_tls_security_level', value: 'may' } + +- name: Remove dynamic configuration for postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item }}[\s]*=' + state: absent + with_items: + - 'myhostname' diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml new file mode 100644 index 000000000..a69c72633 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml @@ -0,0 +1,12 @@ +--- + +- name: Init ssh privilege separation directory + file: + path: "/var/run/sshd" + state: directory + mode: 0755 + owner: "root" + group: "root" + recurse: yes + + diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml new file mode 100644 index 000000000..cf6968a01 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -0,0 +1,41 @@ +--- + +- name: Move dnsmasq group (Alpine family) + group: + name: dnsmasq + gid: 153 + when: ansible_distribution == 'Alpine' + +- name: Create application group + group: + name: "{{ APPLICATION_GROUP }}" + gid: "{{ APPLICATION_GID }}" + +- name: Create application user + user: + name: "{{ APPLICATION_USER }}" + uid: "{{ APPLICATION_UID }}" + group: "{{ APPLICATION_GROUP }}" + shell: "/bin/bash" + home: "/home/{{ APPLICATION_USER }}" + +- name: Init home directory + file: + path: "/home/{{ APPLICATION_USER }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes + +- name: Init bashrc + lineinfile: + dest: "/home/{{ APPLICATION_USER }}/.bashrc" + mode: 0770 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + create: yes + regexp: "export TERM=xterm" + line: "export TERM=xterm" + +- action: setup diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/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-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml new file mode 100644 index 000000000..48a7a3abb --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- include: bootstrap/system.yml +- include: bootstrap/misc.yml +- include: bootstrap/root.yml +- include: bootstrap/supervisor.yml +- include: bootstrap/syslog-ng.yml +- include: bootstrap/pam.yml diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml new file mode 100644 index 000000000..4eed695b1 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml @@ -0,0 +1,8 @@ +--- + +- file: + path: "/var/log/wtmp" + state: touch + mode: 0664 + owner: "root" + group: "root" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml new file mode 100644 index 000000000..a18b2412a --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml @@ -0,0 +1,8 @@ +--- + +- name: Ensure su execution [Alpine family] + lineinfile: + dest: "/etc/pam.d/su" + line: "auth sufficient pam_rootok.so" + create: yes + when: ansible_os_family == "Alpine" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml new file mode 100644 index 000000000..29e955fa4 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml @@ -0,0 +1,5 @@ +--- + +- file: + path: "/root/.profile" + state: absent diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml new file mode 100644 index 000000000..bda0394b6 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -0,0 +1,6 @@ +--- + +- name: Remove /usr/sbin/service + file: + path: '/usr/sbin/service' + state: absent diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml new file mode 100644 index 000000000..27c8f6a30 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml @@ -0,0 +1,33 @@ +--- + +- name: Get syslog-ng version + shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." + register: syslogng_version + +- name: Configure syslog-ng (default) + lineinfile: + dest: /etc/default/syslog-ng + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}="{{ item.value }}"' + create: yes + with_items: + - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } + +- name: Enable syslog-ng config + file: + src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' + dest: '/etc/syslog-ng/syslog-ng.conf' + state: link + force: yes + +- name: Set version of syslog-ng file + lineinfile: + dest: '/etc/syslog-ng/syslog-ng.conf' + regexp: '^@version:' + line: '@version: {{ syslogng_version.stdout }}' + +- name: Ensure /var/lib/syslog-ng exists + file: + path: '/var/lib/syslog-ng' + state: directory + recurse: yes diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0741d7cae --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,33 @@ +--- + +- name: Create /entrypoint.d + file: + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' + state: link + force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/main.yml new file mode 100644 index 000000000..66fb2e38b --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/main.yml @@ -0,0 +1,13 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: build.yml + tags: + - build + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml new file mode 100644 index 000000000..ddd0abbc4 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml @@ -0,0 +1,16 @@ +--- + +- name: Filesystem cleanup [Debian family] + file: + path: "{{ item }}" + state: absent + with_fileglob: + - /var/cache/apt/archives/*.deb + - /var/cache/apt/archives/partial/* + - /var/cache/debconf/*-old + - /var/lib/apt/lists/* + when: ansible_os_family == "Debian" + +- name: Yum cleanup [RedHat family] + command: yum clean all + when: ansible_os_family == "RedHat" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/main.yml new file mode 100644 index 000000000..951b7fc67 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-cleanup/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- include: cleanup.yml + tags: + - bootstrap + - onbuild diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/5.6/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/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap.yml similarity index 50% rename from provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap.yml rename to docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..df39e4bd4 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,23 @@ +--- + +- 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}}" + +############################# +# PHP +############################# + +- name: Set php main file (official) + set_fact: + php_etc_dir: /usr/local/etc/php + php_main_conf: /usr/local/etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /usr/local/etc/php-fpm.d + php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml similarity index 60% rename from provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml rename to docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml similarity index 54% rename from provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml rename to docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..41c1b33dc --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Symlink php-fpm binary + file: + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" + state: link + owner: "root" + group: "root" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..411e736c8 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,11 @@ +--- + +- name: Link php.ini for cli and fpm [Official PHP] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/conf.d/{{ item.target }}' + force: yes + state: link + with_items: + - { 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' } diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml new file mode 100644 index 000000000..caac8f413 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -0,0 +1,23 @@ +--- + +- 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" diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/5.6/conf/provision/variables-webdevops.yml b/docker/php-official/5.6/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/5.6/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php-official/5.6/conf/provision/variables.yml b/docker/php-official/5.6/conf/provision/variables.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/5.6/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile new file mode 100644 index 000000000..68abdbb21 --- /dev/null +++ b/docker/php-official/7.0/Dockerfile @@ -0,0 +1,146 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM php:7.0-fpm + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +ENV TERM "xterm" +ENV LANG "en_US.UTF-8" +ENV LC_ALL "en_US.UTF-8" +ENV APPLICATION_USER application +ENV APPLICATION_GROUP application +ENV APPLICATION_PATH /app +ENV APPLICATION_UID 1000 +ENV APPLICATION_GID 1000 + +ADD baselayout.tar / + +COPY conf/ /opt/docker/ + +# Init bootstrap +RUN set -x \ + # Fix root terminal + && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && /usr/local/bin/apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + # Generate base locale + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + ## Install go-replace + && GOREPLACE_VERSION=0.5.2 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ + && apt-get purge -y -f --force-yes wget dirmngr \ + && /usr/local/bin/docker-image-cleanup + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + +# Install packages +RUN chmod +x /opt/docker/bin/* \ + && /usr/local/bin/apt-install \ + python-minimal \ + supervisor \ + syslog-ng \ + syslog-ng-core \ + cron \ + wget \ + curl \ + net-tools \ + gnupg \ + && chmod +s /usr/local/bin/gosu \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install services +RUN /usr/local/bin/apt-install \ + # Install services + openssh-server \ + mysql-client \ + sqlite \ + dnsmasq \ + postfix \ + # Install common tools + sudo \ + zip \ + unzip \ + bzip2 \ + wget \ + curl \ + net-tools \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + nano \ + vim \ + && /usr/local/bin/generate-locales \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install php environment +RUN /usr/local/bin/apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + && 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 \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 9000 +ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] +CMD ["supervisord"] diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..77aebd57e --- /dev/null +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -0,0 +1,24 @@ +{{ docker.fromOfficial("php", "7.0-fpm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.app() }} + +{{ docker.add('baselayout.tar', '/') }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ bootstrap.debian('jessie') }} + +{{ ansible.debian() }} + +{{ base.debian() }} + +{{ baseapp.debian() }} + +{{ php.official() }} + +{{ docker.expose('9000') }} +{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.0/baselayout.tar b/docker/php-official/7.0/baselayout.tar new file mode 100644 index 0000000000000000000000000000000000000000..68905af7cf1a630e80bb2ca12671b637419715c9 GIT binary patch literal 9601 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 r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?P /opt/docker/BUILDTIME + +# Make all scripts executable +find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x + + +case "$BOOTSTRAP_MODE" in + ################################### + # When container will be build next time + ################################### + "onbuild") + # Init and run bootstrap system + runProvisionOnBuild + ;; + + ################################### + # When container is build this time + ################################### + "bootstrap") + # Init and run bootstrap system + runProvisionBootstrap + runProvisionBuild + ;; + + *) + echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" + exit 1 + ;; + +esac + diff --git a/docker/php-official/7.0/conf/bin/config.sh b/docker/php-official/7.0/conf/bin/config.sh new file mode 100644 index 000000000..3155728e8 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/config.sh @@ -0,0 +1,166 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create named pipe + # + # $1 -> name of file + # + ## +function createNamedPipe() { + rm --force -- "$1" + mknod "$1" p +} + +### + # Escape value for sed usage + # + # $1 -> value + # STDOUT -> escaped value + # + ## +function sedEscape() { + echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" +} + +### + # Replace text inside a file + # + # $1 -> source value + # $2 -> target value + # $3 -> path to file + # + ## +function replaceTextInFile() { + SOURCE="$(sedEscape $1)" + REPLACE="$(sedEscape $2)" + TARGET="$3" + + sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" +} + + +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit +} + +### + # Run "bootstrap" provisioning + ## +function runProvisionBootstrap() { + for FILE in /opt/docker/provision/bootstrap.d/*.sh; do + # run custom scripts, only once + . "$FILE" + rm -f -- "$FILE" + done + + runDockerProvision bootstrap +} + +### + # Run "build" provisioning + ## +function runProvisionBuild() { + for FILE in /opt/docker/provision/build.d/*.sh; do + # run custom scripts, only once + . "$FILE" + done + + runDockerProvision build +} + +### + # Run "onbuild" provisioning + ## +function runProvisionOnBuild() { + includeScriptDir "/opt/docker/provision/onbuild.d" + + runDockerProvision onbuild +} + +### + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" + + runDockerProvision entrypoint +} + + +### + # Run docker provisioning with dyniamic playbook generation + # + # $1 -> playbook tag (bootstrap, onbuild, entrypoint) + # + ## +function runDockerProvision() { + ANSIBLE_TAG="$1" + + /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry +} + diff --git a/docker/php-official/7.0/conf/bin/control.sh b/docker/php-official/7.0/conf/bin/control.sh new file mode 100644 index 000000000..a6697092d --- /dev/null +++ b/docker/php-official/7.0/conf/bin/control.sh @@ -0,0 +1,170 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + "service.disable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..2ca68926c --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..967920837 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +tail -f /dev/null +exit diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..ead991551 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +rootCheck "supervisord" + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/7.0/conf/bin/entrypoint.sh b/docker/php-official/7.0/conf/bin/entrypoint.sh new file mode 100644 index 000000000..169a4bb88 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/entrypoint.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# link stdout from docker +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr +chmod 600 /docker.stdout /docker.stderr + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/7.0/conf/bin/logwatch.sh b/docker/php-official/7.0/conf/bin/logwatch.sh new file mode 100644 index 000000000..1a5b486c7 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/logwatch.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +sleep 0.5 + +if [ -p "$2" ]; then + sed --unbuffered -e "s/^/\[$1\] /" -- "$2" +else + tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" +fi diff --git a/docker/php-official/7.0/conf/bin/provision b/docker/php-official/7.0/conf/bin/provision new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/provision @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/7.0/conf/bin/provision.sh b/docker/php-official/7.0/conf/bin/provision.sh new file mode 100644 index 000000000..4079dd7f0 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/provision.sh @@ -0,0 +1,30 @@ + #!/usr/bin/env bash + +# +# Example: +# provision.sh /opt/foobar/playbook.yml tag +# +# + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +. config.sh + +deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" + + +if [ "$#" -lt 2 ]; then + echo "[ERROR] $0: Playbook or tag is missing" + exit 1 +fi + +ANSIBLE_PLAYBOOK="$1" +shift +ANSIBLE_TAG="$1" +shift +ANSIBLE_OPTS="$@" + +/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/7.0/conf/bin/service.d/cron.sh b/docker/php-official/7.0/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..9bf7c10bf --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/cron.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f diff --git a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..03baba08f --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,32 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +## clear dns file +echo > /etc/dnsmasq.d/webdevops + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops + done +fi diff --git a/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..d16b1acbc --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..312fcd043 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,8 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..8bfb3c036 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# 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 +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty + diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..b25983bd3 --- /dev/null +++ b/docker/php-official/7.0/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/local/bin/php-fpm --nodaemonize diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..7a604874f --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,24 @@ +# force new copy of hosts there (otherwise links could be outdated) +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 + +## MYHOSTNAME +# replace line +sed -i '/myhostname[ ]* =/c\' main.cf +echo "myhostname = $(hostname)" >> /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + # replace line + sed -i '/relayhost[ ]* =/c\' main.cf + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + # replace line + sed -i '/mynetworks[ ]* =/c\' main.cf + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..3ab608679 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/postfix.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +while kill -0 "$(cat /var/spool/postfix/pid/master.pid)"; do + sleep 5 +done diff --git a/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..e3192fe01 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,2 @@ +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/7.0/conf/bin/service.d/ssh.sh b/docker/php-official/7.0/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..ad855563f --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/ssh.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D diff --git a/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/7.0/conf/bin/service.d/supervisor.sh b/docker/php-official/7.0/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..b1741955a --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/supervisor.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user root diff --git a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..09d1730ba --- /dev/null +++ b/docker/php-official/7.0/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS diff --git a/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/7.0/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-official/7.0/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/7.0/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.0/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/etc/php/php.ini b/docker/php-official/7.0/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini b/docker/php-official/7.0/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..562b8d7e2 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/php/php.webdevops.ini @@ -0,0 +1,33 @@ +; ------------------------------------- +; 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.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.0/conf/etc/supervisor.conf b/docker/php-official/7.0/conf/etc/supervisor.conf new file mode 100644 index 000000000..7c109515a --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.conf @@ -0,0 +1,13 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.0/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..a0ad2de88 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.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-official/7.0/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.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-official/7.0/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-error.conf b/docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf similarity index 50% rename from docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-error.conf rename to docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf index 707ba2196..247fd1a25 100644 --- a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-error.conf +++ b/docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf @@ -1,5 +1,10 @@ -[program:log-php-error] -command = bash /opt/docker/bin/logwatch.sh php:error /var/log/php7-fpm/error.log +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s autostart = true autorestart = true stdout_logfile=/dev/stdout diff --git a/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/7.0/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/7.0/conf/provision/ansible.cfg b/docker/php-official/7.0/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.0/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/build.d/.gitkeep b/docker/php-official/7.0/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..20fbdc841 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.0/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.0/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/defaults/main.yml new file mode 100644 index 000000000..e10ef7d38 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_PATH: "{{ lookup('env','APPLICATION_PATH') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml new file mode 100644 index 000000000..ea9e54682 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -0,0 +1,7 @@ +--- + +- include: bootstrap/user.yml +- include: bootstrap/application.yml +- include: bootstrap/dnsmasq.yml +- include: bootstrap/postfix.yml +- include: bootstrap/ssh.yml diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml new file mode 100644 index 000000000..faddb6027 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml @@ -0,0 +1,10 @@ +--- + +- name: Init application directory + file: + path: "/{{ APPLICATION_PATH }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml new file mode 100644 index 000000000..962a7953a --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml @@ -0,0 +1,10 @@ +--- + +- name: Configure dnsmasq + lineinfile: + dest: /etc/dnsmasq.conf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'user', value: 'root' } + - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml new file mode 100644 index 000000000..f05ff660c --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml @@ -0,0 +1,29 @@ +--- + +- name: Link aliases file to postfix aliases + file: + src: '/etc/postfix/aliases' + dest: '/etc/aliases' + state: link + force: yes + when: ansible_os_family == 'Alpine' + +- name: Configure postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'mydestination', value: '' } + - { key: 'message_size_limit', value: '15240000' } + # Hardening + - { key: 'smtp_use_tls', value: 'yes' } + - { key: 'smtp_tls_security_level', value: 'may' } + +- name: Remove dynamic configuration for postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item }}[\s]*=' + state: absent + with_items: + - 'myhostname' diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml new file mode 100644 index 000000000..a69c72633 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml @@ -0,0 +1,12 @@ +--- + +- name: Init ssh privilege separation directory + file: + path: "/var/run/sshd" + state: directory + mode: 0755 + owner: "root" + group: "root" + recurse: yes + + diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml new file mode 100644 index 000000000..cf6968a01 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -0,0 +1,41 @@ +--- + +- name: Move dnsmasq group (Alpine family) + group: + name: dnsmasq + gid: 153 + when: ansible_distribution == 'Alpine' + +- name: Create application group + group: + name: "{{ APPLICATION_GROUP }}" + gid: "{{ APPLICATION_GID }}" + +- name: Create application user + user: + name: "{{ APPLICATION_USER }}" + uid: "{{ APPLICATION_UID }}" + group: "{{ APPLICATION_GROUP }}" + shell: "/bin/bash" + home: "/home/{{ APPLICATION_USER }}" + +- name: Init home directory + file: + path: "/home/{{ APPLICATION_USER }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes + +- name: Init bashrc + lineinfile: + dest: "/home/{{ APPLICATION_USER }}/.bashrc" + mode: 0770 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + create: yes + regexp: "export TERM=xterm" + line: "export TERM=xterm" + +- action: setup diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/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-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml new file mode 100644 index 000000000..48a7a3abb --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- include: bootstrap/system.yml +- include: bootstrap/misc.yml +- include: bootstrap/root.yml +- include: bootstrap/supervisor.yml +- include: bootstrap/syslog-ng.yml +- include: bootstrap/pam.yml diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml new file mode 100644 index 000000000..4eed695b1 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml @@ -0,0 +1,8 @@ +--- + +- file: + path: "/var/log/wtmp" + state: touch + mode: 0664 + owner: "root" + group: "root" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml new file mode 100644 index 000000000..a18b2412a --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml @@ -0,0 +1,8 @@ +--- + +- name: Ensure su execution [Alpine family] + lineinfile: + dest: "/etc/pam.d/su" + line: "auth sufficient pam_rootok.so" + create: yes + when: ansible_os_family == "Alpine" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml new file mode 100644 index 000000000..29e955fa4 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml @@ -0,0 +1,5 @@ +--- + +- file: + path: "/root/.profile" + state: absent diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml new file mode 100644 index 000000000..bda0394b6 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -0,0 +1,6 @@ +--- + +- name: Remove /usr/sbin/service + file: + path: '/usr/sbin/service' + state: absent diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml new file mode 100644 index 000000000..27c8f6a30 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml @@ -0,0 +1,33 @@ +--- + +- name: Get syslog-ng version + shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." + register: syslogng_version + +- name: Configure syslog-ng (default) + lineinfile: + dest: /etc/default/syslog-ng + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}="{{ item.value }}"' + create: yes + with_items: + - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } + +- name: Enable syslog-ng config + file: + src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' + dest: '/etc/syslog-ng/syslog-ng.conf' + state: link + force: yes + +- name: Set version of syslog-ng file + lineinfile: + dest: '/etc/syslog-ng/syslog-ng.conf' + regexp: '^@version:' + line: '@version: {{ syslogng_version.stdout }}' + +- name: Ensure /var/lib/syslog-ng exists + file: + path: '/var/lib/syslog-ng' + state: directory + recurse: yes diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0741d7cae --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,33 @@ +--- + +- name: Create /entrypoint.d + file: + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' + state: link + force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/main.yml new file mode 100644 index 000000000..66fb2e38b --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/main.yml @@ -0,0 +1,13 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: build.yml + tags: + - build + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml new file mode 100644 index 000000000..ddd0abbc4 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml @@ -0,0 +1,16 @@ +--- + +- name: Filesystem cleanup [Debian family] + file: + path: "{{ item }}" + state: absent + with_fileglob: + - /var/cache/apt/archives/*.deb + - /var/cache/apt/archives/partial/* + - /var/cache/debconf/*-old + - /var/lib/apt/lists/* + when: ansible_os_family == "Debian" + +- name: Yum cleanup [RedHat family] + command: yum clean all + when: ansible_os_family == "RedHat" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/main.yml new file mode 100644 index 000000000..951b7fc67 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-cleanup/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- include: cleanup.yml + tags: + - bootstrap + - onbuild diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/7.0/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-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap.yml new file mode 100644 index 000000000..99a2e5191 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -0,0 +1,10 @@ +--- + +- include: bootstrap/init.yml +- include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml +- include: bootstrap/php-fpm.main.yml +- include: bootstrap/php-fpm.pool.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..df39e4bd4 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,23 @@ +--- + +- 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}}" + +############################# +# PHP +############################# + +- name: Set php main file (official) + set_fact: + php_etc_dir: /usr/local/etc/php + php_main_conf: /usr/local/etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /usr/local/etc/php-fpm.d + php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml new file mode 100644 index 000000000..857983cb3 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -0,0 +1,47 @@ +--- + +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ + +- 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 (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml new file mode 100644 index 000000000..51b884a48 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -0,0 +1,92 @@ +--- + +- 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: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory + +- 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 pool 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 (application.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.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } + - { key: 'slowlog', value: "/docker.stderr" } + - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } + - { key: 'php_admin_value[log_errors]', value: "on" } + - { key: 'user', value: "{{ APPLICATION_USER }}" } + - { key: 'group', value: "{{ APPLICATION_GROUP }}" } + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: + 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-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..41c1b33dc --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Symlink php-fpm binary + file: + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" + state: link + owner: "root" + group: "root" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..411e736c8 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,11 @@ +--- + +- name: Link php.ini for cli and fpm [Official PHP] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/conf.d/{{ item.target }}' + force: yes + state: link + with_items: + - { 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' } diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml new file mode 100644 index 000000000..caac8f413 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -0,0 +1,23 @@ +--- + +- 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" diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/7.0/conf/provision/variables-webdevops.yml b/docker/php-official/7.0/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/7.0/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php-official/7.0/conf/provision/variables.yml b/docker/php-official/7.0/conf/provision/variables.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/7.0/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile new file mode 100644 index 000000000..b52c124f3 --- /dev/null +++ b/docker/php-official/7.1/Dockerfile @@ -0,0 +1,146 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-official:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM php:7.1-fpm + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +ENV TERM "xterm" +ENV LANG "en_US.UTF-8" +ENV LC_ALL "en_US.UTF-8" +ENV APPLICATION_USER application +ENV APPLICATION_GROUP application +ENV APPLICATION_PATH /app +ENV APPLICATION_UID 1000 +ENV APPLICATION_GID 1000 + +ADD baselayout.tar / + +COPY conf/ /opt/docker/ + +# Init bootstrap +RUN set -x \ + # Fix root terminal + && echo "export TERM=xterm" >> /root/.bashrc \ + && apt-update \ + && /usr/local/bin/generate-dockerimage-info \ + # Enable non-free + && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && apt-update \ + # System update + && /usr/local/bin/apt-upgrade \ + # Base stuff + && /usr/local/bin/apt-install \ + apt-transport-https \ + ca-certificates \ + locales \ + # Generate base locale + && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ + && locale-gen \ + # Install gosu + && GOSU_VERSION=1.10 \ + && /usr/local/bin/apt-install wget gnupg dirmngr \ + && dpkgArch="amd64" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true \ + ## Install go-replace + && GOREPLACE_VERSION=0.5.2 \ + && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ + && chmod +x /usr/local/bin/go-replace \ + && apt-get purge -y -f --force-yes wget dirmngr \ + && /usr/local/bin/docker-image-cleanup + +# Install ansible +RUN /usr/local/bin/apt-install \ + # Install ansible + python-minimal \ + python-setuptools \ + python-pip \ + python-paramiko \ + python-jinja2 \ + python-dev \ + libffi-dev \ + libssl-dev \ + build-essential \ + && pip install --upgrade pip \ + && hash -r \ + && pip install --no-cache-dir ansible \ + && chmod 750 /usr/local/bin/ansible* \ + # Cleanup + && apt-get purge -y -f --force-yes \ + python-dev \ + build-essential \ + libssl-dev \ + libffi-dev \ + && /usr/local/bin/docker-image-cleanup + +# Install packages +RUN chmod +x /opt/docker/bin/* \ + && /usr/local/bin/apt-install \ + python-minimal \ + supervisor \ + syslog-ng \ + syslog-ng-core \ + cron \ + wget \ + curl \ + net-tools \ + gnupg \ + && chmod +s /usr/local/bin/gosu \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install services +RUN /usr/local/bin/apt-install \ + # Install services + openssh-server \ + mysql-client \ + sqlite \ + dnsmasq \ + postfix \ + # Install common tools + sudo \ + zip \ + unzip \ + bzip2 \ + wget \ + curl \ + net-tools \ + moreutils \ + dnsutils \ + openssh-client \ + rsync \ + git \ + nano \ + vim \ + && /usr/local/bin/generate-locales \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup + +# Install php environment +RUN /usr/local/bin/apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + && 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 \ + && /usr/local/bin/docker-image-cleanup + +EXPOSE 9000 +ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] +CMD ["supervisord"] diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..56800f890 --- /dev/null +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -0,0 +1,24 @@ +{{ docker.fromOfficial("php", "7.1-fpm") }} + +{{ docker.version() }} + +{{ environment.general() }} +{{ environment.app() }} + +{{ docker.add('baselayout.tar', '/') }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ bootstrap.debian('jessie') }} + +{{ ansible.debian() }} + +{{ base.debian() }} + +{{ baseapp.debian() }} + +{{ php.official() }} + +{{ docker.expose('9000') }} +{{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/php-official/7.1/baselayout.tar b/docker/php-official/7.1/baselayout.tar new file mode 100644 index 0000000000000000000000000000000000000000..68905af7cf1a630e80bb2ca12671b637419715c9 GIT binary patch literal 9601 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 r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?P /opt/docker/BUILDTIME + +# Make all scripts executable +find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x + + +case "$BOOTSTRAP_MODE" in + ################################### + # When container will be build next time + ################################### + "onbuild") + # Init and run bootstrap system + runProvisionOnBuild + ;; + + ################################### + # When container is build this time + ################################### + "bootstrap") + # Init and run bootstrap system + runProvisionBootstrap + runProvisionBuild + ;; + + *) + echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" + exit 1 + ;; + +esac + diff --git a/docker/php-official/7.1/conf/bin/config.sh b/docker/php-official/7.1/conf/bin/config.sh new file mode 100644 index 000000000..3155728e8 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/config.sh @@ -0,0 +1,166 @@ +#!/usr/bin/env bash + +shopt -s nullglob + +### + # Check if current user is root + # + ## +function rootCheck() { + # Root check + if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] $* must be run as root" + exit 1 + fi +} + +### + # Create named pipe + # + # $1 -> name of file + # + ## +function createNamedPipe() { + rm --force -- "$1" + mknod "$1" p +} + +### + # Escape value for sed usage + # + # $1 -> value + # STDOUT -> escaped value + # + ## +function sedEscape() { + echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" +} + +### + # Replace text inside a file + # + # $1 -> source value + # $2 -> target value + # $3 -> path to file + # + ## +function replaceTextInFile() { + SOURCE="$(sedEscape $1)" + REPLACE="$(sedEscape $2)" + TARGET="$3" + + sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" +} + + +### + # Include script directory text inside a file + # + # $1 -> path + # + ## +function includeScriptDir() { + if [[ -d "$1" ]]; then + for FILE in "$1"/*.sh; do + # run custom scripts, only once + . "$FILE" + done + fi +} + +### + # Show deprecation notice + # + ## +function deprecationNotice() { + echo "" + echo "###############################################################################" + echo "### THIS CALL IS DEPRECATED AND WILL BE REMOVED IN THE FUTURE" + echo "###" + echo "### $*" + echo "###" + echo "###############################################################################" + echo "" +} + +### + # Run "entrypoint" scripts + ## +function runEntrypoints() { + ############### + # Try to find entrypoint + ############### + + ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh" + + if [ -f "$ENTRYPOINT_SCRIPT" ]; then + . "$ENTRYPOINT_SCRIPT" + fi + + ############### + # Run default + ############### + if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then + . /opt/docker/bin/entrypoint.d/default.sh + fi + + exit +} + +### + # Run "bootstrap" provisioning + ## +function runProvisionBootstrap() { + for FILE in /opt/docker/provision/bootstrap.d/*.sh; do + # run custom scripts, only once + . "$FILE" + rm -f -- "$FILE" + done + + runDockerProvision bootstrap +} + +### + # Run "build" provisioning + ## +function runProvisionBuild() { + for FILE in /opt/docker/provision/build.d/*.sh; do + # run custom scripts, only once + . "$FILE" + done + + runDockerProvision build +} + +### + # Run "onbuild" provisioning + ## +function runProvisionOnBuild() { + includeScriptDir "/opt/docker/provision/onbuild.d" + + runDockerProvision onbuild +} + +### + # Run "entrypoint" provisioning + ## +function runProvisionEntrypoint() { + includeScriptDir "/opt/docker/provision/entrypoint.d" + includeScriptDir "/entrypoint.d" + + runDockerProvision entrypoint +} + + +### + # Run docker provisioning with dyniamic playbook generation + # + # $1 -> playbook tag (bootstrap, onbuild, entrypoint) + # + ## +function runDockerProvision() { + ANSIBLE_TAG="$1" + + /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry +} + diff --git a/docker/php-official/7.1/conf/bin/control.sh b/docker/php-official/7.1/conf/bin/control.sh new file mode 100644 index 000000000..a6697092d --- /dev/null +++ b/docker/php-official/7.1/conf/bin/control.sh @@ -0,0 +1,170 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +CONTROL_COMMAND="$1" +shift + +case "$CONTROL_COMMAND" in + + ## ------------------------------------------ + ## PROVISION + ## ------------------------------------------ + + ## main roles + "provision.role") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint "$1" + ;; + + "provision.role.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap "$1" + ;; + + "provision.role.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build "$1" + ;; + + "provision.role.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild "$1" + ;; + + "provision.role.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint "$1" + ;; + + ## startup roles + "provision.role.startup") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 50 "$1" + ;; + + "provision.role.startup.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 50 "$1" + ;; + + "provision.role.startup.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 50 "$1" + ;; + + "provision.role.startup.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 50 "$1" + ;; + + "provision.role.startup.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 50 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 50 "$1" + ;; + + ## finish roles + "provision.role.finish") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --tag build --tag onbuild --tag entrypoint --priority 200 "$1" + ;; + + "provision.role.finish.bootstrap") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag bootstrap --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag bootstrap --priority 200 "$1" + ;; + + "provision.role.finish.build") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag build --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag build --priority 200 "$1" + ;; + + "provision.role.finish.onbuild") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag onbuild --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag onbuild --priority 200 "$1" + ;; + + "provision.role.finish.entrypoint") + deprecationNotice " Please use >>/opt/docker/bin/provision add --tag entrypoint --priority 200 [role]<< for adding provision roles" + /opt/docker/bin/provision add --tag entrypoint --priority 200 "$1" + ;; + + ## ------------------------------------------ + ## Service + ## ------------------------------------------ + + "service.enable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + "service.disable") + SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" + if [ -f "$SERVICE_FILE" ]; then + sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" + exit 1 + fi + ;; + + ## ------------------------------------------ + ## Version + ## ------------------------------------------ + + "version.get") + cat /opt/docker/VERSION + ;; + + "version.require.min") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -lt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is not up2date!" + echo "--- " + echo "--- Version expected min: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "--- " + echo "--- Run 'docker pull ' to update image" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + "version.require.max") + EXPECTED_VERSION="$1" + CURRENT_VERSION="$(cat /opt/docker/VERSION)" + if [ "$CURRENT_VERSION" -gt "$EXPECTED_VERSION" ]; then + echo "-----------------------------------------------------------" + echo "--- This docker image is too new!" + echo "--- " + echo "--- Version expected max: $EXPECTED_VERSION" + echo "--- Version current: $CURRENT_VERSION" + echo "-----------------------------------------------------------" + exit 1 + fi + ;; + + + "buildtime.get") + cat /opt/docker/BUILDTIME + ;; + + *) + echo "[ERROR] Invalid controll command: \"${CONTROL_COMMAND}\"" + exit 1 + ;; +esac diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh new file mode 100644 index 000000000..2ca68926c --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +############################################# +## Run CLI_SCRIPT from environment variable +############################################# + +if [ -n "${CLI_SCRIPT}" ]; then + if [ -n "$APPLICATION_USER" ]; then + # Run as EFFECTIVE_USER + shift + exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + else + # Run as root + exec ${CLI_SCRIPT} "$@" + fi +else + echo "[ERROR] No CLI_SCRIPT in in docker environment defined" + exit 1 +fi diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh new file mode 100644 index 000000000..a1be715fe --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/default.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec "$@" diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh new file mode 100644 index 000000000..967920837 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +############################################# +## NOOP (no operation) +############################################# + +tail -f /dev/null +exit diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh new file mode 100644 index 000000000..6fa0d063e --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/root.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +############################################# +## Root shell +############################################# + +if [ "$#" -eq 1 ]; then + ## No command, fall back to interactive shell + exec bash +else + ## Exec root command + shift + exec "$@" +fi diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh new file mode 100644 index 000000000..ead991551 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +############################################# +## Supervisord (start daemons) +############################################# + +rootCheck "supervisord" + +## Start services +exec /opt/docker/bin/service.d/supervisor.sh + diff --git a/docker/php-official/7.1/conf/bin/entrypoint.sh b/docker/php-official/7.1/conf/bin/entrypoint.sh new file mode 100644 index 000000000..169a4bb88 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/entrypoint.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +if [[ -z "$CONTAINER_UID" ]]; then + export CONTAINER_UID="application" +fi + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# auto elevate privileges (if container is not started as root) +if [[ "$UID" -ne 0 ]]; then + export CONTAINER_UID="$UID" + exec gosu root "$0" "$@" +fi +# remove suid bit on gosu +chmod -s /usr/local/bin/gosu + +trap 'echo sigterm ; exit' SIGTERM +trap 'echo sigkill ; exit' SIGKILL + +# link stdout from docker +if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" +fi + +if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" +fi + +ln -f -s "$LOG_STDOUT" /docker.stdout +ln -f -s "$LOG_STDERR" /docker.stderr +chmod 600 /docker.stdout /docker.stderr + +# sanitize input and set task +TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" + +source /opt/docker/bin/config.sh + +if [[ "$UID" -eq 0 ]]; then + # Only run provision if user is root + + if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then + # Visible provisioning + runProvisionEntrypoint + else + # Hidden provisioning + runProvisionEntrypoint > /dev/null + fi +fi + +############################# +## COMMAND +############################# + +runEntrypoints "$@" diff --git a/docker/php-official/7.1/conf/bin/logwatch.sh b/docker/php-official/7.1/conf/bin/logwatch.sh new file mode 100644 index 000000000..1a5b486c7 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/logwatch.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +sleep 0.5 + +if [ -p "$2" ]; then + sed --unbuffered -e "s/^/\[$1\] /" -- "$2" +else + tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" +fi diff --git a/docker/php-official/7.1/conf/bin/provision b/docker/php-official/7.1/conf/bin/provision new file mode 100755 index 000000000..d367c2812 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/provision @@ -0,0 +1,328 @@ +#!/usr/bin/env python + +import os +import argparse +import json +import sys +from string import Template +from subprocess import call +import tempfile +import time + +STORAGE = '/opt/docker/etc/.registry/provision.json' +PROVISION_DIR = '/opt/docker/provision/' + +PLAYBOOK_TAGS=['bootstrap', 'build', 'onbuild', 'entrypoint'] + +PLAYBOOK = Template( +"""--- + +- hosts: all + vars_files: + - ./variables-webdevops.yml + - ./variables.yml + roles: + - $roles +""") + + + +def readJson(): + ret = {} + + # create registry directory if it doesn't exists + if not os.path.exists(os.path.dirname(STORAGE)): + os.mkdir(os.path.dirname(STORAGE)) + + # try to read file + if os.path.isfile(STORAGE): + f=open(STORAGE).read() + ret = json.loads(f) + + return ret + + + +def saveJson(data): + with open(STORAGE, 'w') as f: + json.dump(data, f) + + + +def buildRoleList(tags): + json = readJson() + roleList = {} + + # fetch roles list for each tag + for tag in tags: + if tag in json: + for role in json[tag]: + roleRow = json[tag][role] + if role not in roleList: + roleList[role] = {} + + if 'tags' not in roleList[role]: + roleList[role]['tags'] = {} + + roleList[role]['role'] = role + roleList[role]['added'] = roleRow['added'] + roleList[role]['priority'] = roleRow['priority'] + roleList[role]['tags'][tag] = tag + + return roleList + + +def buildSortedRoleList(tags): + roleList = buildRoleList(tags) + + # sort list + roleList = sorted(roleList, key=lambda x: (roleList[x]['priority'], roleList[x]['added'])) + + return roleList + + + +def buildPlaybook(roleList): + ## build playbook + ret = PLAYBOOK.substitute( + roles = "\n - ".join(roleList) + ) + + return ret + + +def buildPlaybookFromArgs(args): + roleList = [] + + ## add roles from tag (if use registry is active) + if args.useRegistry and args.tags: + roleList.extend(buildSortedRoleList(args.tags)) + + ## add roles from command arguments + if args.roles: + for role in args.roles: + roleList.extend(role.split(',')) + + if roleList: + return buildPlaybook(roleList) + else: + return False + + + +def actionRun(args): + if args.playbook: + ## predefined playbook + playbook = args.playbook + else: + ## dynamic playbook + playbookContent = buildPlaybookFromArgs(args) + + if playbookContent: + f = tempfile.NamedTemporaryFile(dir=PROVISION_DIR, prefix='playbook.', suffix='.yml', delete=False) + f.write(playbookContent) + f.close() + playbook = f.name + else: + ## nothing to do + sys.exit(0) + + ## build ansible command with args + cmd = [ + 'ansible-playbook', + playbook, + '-i', 'localhost,', + '--connection=local', + ] + + if args.tags: + cmd.extend([ + '--tags=' + ','.join(args.tags) + ]) + + if args.args: + cmd.extend(args.args) + + ## run ansible + retval = call(cmd) + + ## cleanup dynamic playbook + if not args.playbook: + os.unlink(playbook) + + sys.exit(retval) + + + +def actionPlaybook(args): + playbook = buildPlaybookFromArgs(args) + + if playbook: + print playbook + else: + sys.exit(1) + + + +def actionList(args): + json = readJson() + list = {} + + for tag in args.tags: + if tag in json: + for role in json[tag]: + print role + + + +def actionAdd(args): + json = readJson() + + for tag in args.tags: + for role in args.role: + if tag not in json: + json[tag] = {} + + json[tag][role] = { + 'name': role, + 'added': int(time.time()), + 'priority': args.priority + } + + saveJson(json) + + + +def actionSummary(args): + # list all roles in each possible tag + for tag in PLAYBOOK_TAGS: + roleList = buildRoleList([tag]) + if roleList: + maxLength = len(max(roleList.keys(), key=len)) + + print "Roles in " + tag + ":" + for role in roleList: + print ' - ' + role.ljust(maxLength, ' ') + ' [priority: ' + str(roleList[role]['priority']) + ']' + print '' + + + +def main(args): + actions = { + 'list': actionList, + 'add': actionAdd, + 'summary': actionSummary, + 'playbook': actionPlaybook, + 'run': actionRun + } + + func = actions.get(args.action, lambda: "nothing") + return func(args) + + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + subparsers = parser.add_subparsers( + title='subcommands', + dest='action' + ) + + ################################### + ## SUMMARY command + summary = subparsers.add_parser('summary') + + ################################### + ## RUN command + run = subparsers.add_parser('run') + run.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + run.add_argument( + '--playbook', + dest='playbook', + help='Ansible playbook' + ) + run.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + run.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible role' + ) + run.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## PLAYBOOK command + playbook = subparsers.add_parser('playbook') + playbook.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + playbook.add_argument( + '--use-registry', + dest='useRegistry', + action='store_true', + help='Use registred roles' + ) + playbook.add_argument( + '--role', + dest='roles', + action='append', + help='Ansible tag' + ) + playbook.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## LIST command + list = subparsers.add_parser('list') + list.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + list.add_argument('args', nargs=argparse.REMAINDER) + + ################################### + ## ADD command + add = subparsers.add_parser('add') + add.add_argument( + '--tag', + dest='tags', + choices=PLAYBOOK_TAGS, + required=True, + action='append', + help='Ansible tag' + ) + add.add_argument( + '--priority', + type=int, + default=100, + dest='priority', + help='Priority for role [default 100, 1 is most important]' + ) + add.add_argument('role', metavar='roles', nargs='+', help='Ansible roles') + + add.add_argument('args', nargs=argparse.REMAINDER) + + ## Execute + args = parser.parse_args() + main(args) diff --git a/docker/php-official/7.1/conf/bin/provision.sh b/docker/php-official/7.1/conf/bin/provision.sh new file mode 100644 index 000000000..4079dd7f0 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/provision.sh @@ -0,0 +1,30 @@ + #!/usr/bin/env bash + +# +# Example: +# provision.sh /opt/foobar/playbook.yml tag +# +# + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +. config.sh + +deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" + + +if [ "$#" -lt 2 ]; then + echo "[ERROR] $0: Playbook or tag is missing" + exit 1 +fi + +ANSIBLE_PLAYBOOK="$1" +shift +ANSIBLE_TAG="$1" +shift +ANSIBLE_OPTS="$@" + +/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/cron.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/7.1/conf/bin/service.d/cron.sh b/docker/php-official/7.1/conf/bin/service.d/cron.sh new file mode 100644 index 000000000..9bf7c10bf --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/cron.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/cron.d/" + +exec /usr/sbin/cron -f diff --git a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh new file mode 100644 index 000000000..03baba08f --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.d/10-init.sh @@ -0,0 +1,32 @@ +# Create dnsmasq.d directory if not exists +mkdir -p -- /etc/dnsmasq.d/ + +## clear dns file +echo > /etc/dnsmasq.d/webdevops + +if [ ! -f /etc/resolv.conf.original ]; then + cp -a /etc/resolv.conf /etc/resolv.conf.original + + ## set forward servers + cat /etc/resolv.conf.original | grep nameserver | sed 's/nameserver /server=/' > /etc/dnsmasq.d/forward + + ## set dnsmasq to main nameserver + echo "nameserver 127.0.0.1" > /etc/resolv.conf +fi + + +# Add own VIRTUAL_HOST as loopback +if [[ -n "${VIRTUAL_HOST+x}" ]]; then + # split comma by space + VIRTUAL_HOST_LIST=${VIRTUAL_HOST//,/$'\n'} + + # replace *.domain for dns specific .domain wildcard + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/\*./.} + + # no support for .* + VIRTUAL_HOST_LIST=${VIRTUAL_HOST_LIST/.\*/.} + + for DOMAIN in $VIRTUAL_HOST_LIST; do + echo "address=/${DOMAIN}/127.0.0.1" >> /etc/dnsmasq.d/webdevops + done +fi diff --git a/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh new file mode 100644 index 000000000..d16b1acbc --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/dnsmasq.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/dnsmasq.d/" + +exec dnsmasq --keep-in-foreground diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh new file mode 100644 index 000000000..312fcd043 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh @@ -0,0 +1,8 @@ +# setup user env +FPM_POOL_CONF="/opt/docker/etc/php/fpm/pool.d/application.conf" + +## Setup container uid +if [[ -n "$CONTAINER_UID" ]]; then + sed -i "s/user[ ]*=.*/user = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" + sed -i "s/group[ ]*=.*/group = ${CONTAINER_UID}/g" "$FPM_POOL_CONF" +fi diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh new file mode 100644 index 000000000..8bfb3c036 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -0,0 +1,38 @@ +# +# 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 +go-replace \ + -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ + --path=/opt/docker/etc/php/fpm/pool.d/ \ + --path-pattern= '*.conf' \ + --ignore-empty + diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh new file mode 100644 index 000000000..b25983bd3 --- /dev/null +++ b/docker/php-official/7.1/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/local/bin/php-fpm --nodaemonize diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh new file mode 100644 index 000000000..7a604874f --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh @@ -0,0 +1,24 @@ +# force new copy of hosts there (otherwise links could be outdated) +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 + +## MYHOSTNAME +# replace line +sed -i '/myhostname[ ]* =/c\' main.cf +echo "myhostname = $(hostname)" >> /etc/postfix/main.cf + +## REPLAYHOST +if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; then + # replace line + sed -i '/relayhost[ ]* =/c\' main.cf + echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf +fi + +## MYNETWORKS +if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then + # replace line + sed -i '/mynetworks[ ]* =/c\' main.cf + echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf +fi diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.sh new file mode 100644 index 000000000..3ab608679 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/postfix.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# postfix-wrapper.sh, version 0.1.0 +# +# You cannot start postfix in some foreground mode and +# it's more or less important that docker doesn't kill +# postfix and its chilren if you stop the container. +# +# Use this script with supervisord and it will take +# care about starting and stopping postfix correctly. +# +# supervisord config snippet for postfix-wrapper: +# +# [program:postfix] +# process_name = postfix +# command = /path/to/postfix-wrapper.sh +# startsecs = 0 +# autorestart = false +# + +source /opt/docker/bin/config.sh + +trap "postfix stop" SIGINT +trap "postfix stop" SIGTERM +trap "postfix reload" SIGHUP + +includeScriptDir "/opt/docker/bin/service.d/postfix.d/" + +# start postfix +postfix start + +# lets give postfix some time to start +sleep 3 + +# wait until postfix is dead (triggered by trap) +while kill -0 "$(cat /var/spool/postfix/pid/master.pid)"; do + sleep 5 +done diff --git a/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..e3192fe01 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,2 @@ +# generate host keys +ssh-keygen -A diff --git a/docker/php-official/7.1/conf/bin/service.d/ssh.sh b/docker/php-official/7.1/conf/bin/service.d/ssh.sh new file mode 100644 index 000000000..ad855563f --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/ssh.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/ssh.d/" + +exec /usr/sbin/sshd -D diff --git a/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/supervisor.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-official/7.1/conf/bin/service.d/supervisor.sh b/docker/php-official/7.1/conf/bin/service.d/supervisor.sh new file mode 100644 index 000000000..b1741955a --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/supervisor.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/supervisor.d/" + +exec supervisord -c /opt/docker/etc/supervisor.conf --logfile /dev/null --pidfile /dev/null --user root diff --git a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh new file mode 100644 index 000000000..326207e52 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.d/10-init.sh @@ -0,0 +1,10 @@ +# If /dev/log is either a named pipe or it was placed there accidentally, +# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25, +# then we remove it. +if [ ! -S /dev/log ]; then rm -f /dev/log; fi +if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi + +if [[ ! -p /docker.stdout ]]; then + # Switch to file (tty docker mode) + go-replace -s 'pipe("/docker.stdout")' -r 'file("/docker.stdout")' -- /opt/docker/etc/syslog-ng/syslog-ng.conf +fi diff --git a/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh new file mode 100644 index 000000000..09d1730ba --- /dev/null +++ b/docker/php-official/7.1/conf/bin/service.d/syslog-ng.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +exec syslog-ng -F --no-caps -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS diff --git a/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm b/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm new file mode 100644 index 000000000..e6ef4b123 --- /dev/null +++ b/docker/php-official/7.1/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-official/7.1/conf/etc/logrotate.d/syslog-ng b/docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng new file mode 100644 index 000000000..4a6f9c54e --- /dev/null +++ b/docker/php-official/7.1/conf/etc/logrotate.d/syslog-ng @@ -0,0 +1,38 @@ +/var/log/syslog +{ + rotate 7 + daily + missingok + notifempty + delaycompress + compress + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + endscript +} + +/var/log/mail.info +/var/log/mail.warn +/var/log/mail.err +/var/log/mail.log +/var/log/daemon.log +/var/log/kern.log +/var/log/auth.log +/var/log/user.log +/var/log/lpr.log +/var/log/cron.log +/var/log/debug +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` > /dev/null + supervisorctl restart syslog-ng-stdout > /dev/null + endscript +} \ No newline at end of file diff --git a/docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep b/docker/php-official/7.1/conf/etc/php/conf.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/etc/php/php.ini b/docker/php-official/7.1/conf/etc/php/php.ini new file mode 100644 index 000000000..447212118 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/php/php.ini @@ -0,0 +1 @@ +; placeholder diff --git a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini b/docker/php-official/7.1/conf/etc/php/php.webdevops.ini new file mode 100644 index 000000000..562b8d7e2 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/php/php.webdevops.ini @@ -0,0 +1,33 @@ +; ------------------------------------- +; 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.interned_strings_buffer = 16 +opcache.max_accelerated_files = 7963 +opcache.fast_shutdown = 1 diff --git a/docker/php-official/7.1/conf/etc/supervisor.conf b/docker/php-official/7.1/conf/etc/supervisor.conf new file mode 100644 index 000000000..7c109515a --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.conf @@ -0,0 +1,13 @@ +[supervisord] +nodaemon=true + +[unix_http_server] +file = /var/run/supervisor.sock +# username = root +# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[include] +files = /opt/docker/etc/supervisor.d/*.conf diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep b/docker/php-official/7.1/conf/etc/supervisor.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf b/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf new file mode 100644 index 000000000..ef0a71678 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/cron.conf @@ -0,0 +1,14 @@ +[group:cron] +programs=crond +priority=25 + +[program:crond] +command = /opt/docker/bin/service.d/cron.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..a0ad2de88 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.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-official/7.1/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf new file mode 100644 index 000000000..5781f5b0a --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf @@ -0,0 +1,15 @@ +[group:php-fpm] +programs=php-fpmd +priority=20 + +[program:php-fpmd] +command = /opt/docker/bin/service.d/php-fpm.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-official/7.1/conf/etc/supervisor.d/postfix.conf b/docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf new file mode 100644 index 000000000..b8d70bb40 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/postfix.conf @@ -0,0 +1,15 @@ +[group:postfix] +programs=postfixd +priority=30 + +[program:postfixd] +directory = /etc/postfix +command = /opt/docker/bin/service.d/postfix.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf b/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf new file mode 100644 index 000000000..0ecd798d6 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/ssh.conf @@ -0,0 +1,14 @@ +[group:ssh] +programs=sshd +priority=30 + +[program:sshd] +command = /opt/docker/bin/service.d/ssh.sh +process_name=%(program_name)s +startsecs=0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-fpm.conf b/docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf similarity index 50% rename from docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-fpm.conf rename to docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf index 81c631cde..247fd1a25 100644 --- a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-fpm.conf +++ b/docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf @@ -1,5 +1,10 @@ -[program:log-php-fpm] -command = bash /opt/docker/bin/logwatch.sh php:fpm /var/log/php7-fpm/fpm.log +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s autostart = true autorestart = true stdout_logfile=/dev/stdout diff --git a/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..c69841581 --- /dev/null +++ b/docker/php-official/7.1/conf/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,48 @@ +@version: 3.5 + +template t_isostamp { + # syslog-t_isostamp START + template("[SYSLOG] $MSGHDR$MSG\n"); + # syslog-t_isostamp END +}; + +options { + # syslog-options START + file-template(t_isostamp); + chain_hostnames(off); + flush_lines(0); + use-dns(no); + use_fqdn(no); + owner("root"); + group("adm"); + perm(0640); + stats_freq(0); + # syslog-options START +}; + +source s_src { + # syslog-s_src START + unix-stream("/dev/log"); + internal(); + # syslog-s_src END +}; + +filter f_filter { + # syslog-f_filter START + not facility(auth, authpriv); + # syslog-f_filter END +}; + +destination d_all { + # syslog-d_all START + pipe("/docker.stdout"); + # syslog-d_all END +}; + +log { + # syslog-log START + source(s_src); + filter(f_filter); + destination(d_all); + # syslog-log START +}; diff --git a/docker/php-official/7.1/conf/provision/ansible.cfg b/docker/php-official/7.1/conf/provision/ansible.cfg new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/7.1/conf/provision/bootstrap.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/build.d/.gitkeep b/docker/php-official/7.1/conf/provision/build.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh b/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh new file mode 100644 index 000000000..20fbdc841 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/build.d/10-cleanup.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +## remove logs (each bootstrap) +rm -rf -- /var/log/* +rm -rf -- /var/tmp/* +rm -rf -- /tmp/* diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/7.1/conf/provision/entrypoint.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh new file mode 100644 index 000000000..6f77d8e40 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/entrypoint.d/05-permissions.sh @@ -0,0 +1,2 @@ +# Fix rights of /tmp (can be a volume) +chmod 1777 /tmp diff --git a/docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep b/docker/php-official/7.1/conf/provision/onbuild.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/defaults/main.yml new file mode 100644 index 000000000..e10ef7d38 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_PATH: "{{ lookup('env','APPLICATION_PATH') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml new file mode 100644 index 000000000..ea9e54682 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -0,0 +1,7 @@ +--- + +- include: bootstrap/user.yml +- include: bootstrap/application.yml +- include: bootstrap/dnsmasq.yml +- include: bootstrap/postfix.yml +- include: bootstrap/ssh.yml diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml new file mode 100644 index 000000000..faddb6027 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml @@ -0,0 +1,10 @@ +--- + +- name: Init application directory + file: + path: "/{{ APPLICATION_PATH }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml new file mode 100644 index 000000000..962a7953a --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml @@ -0,0 +1,10 @@ +--- + +- name: Configure dnsmasq + lineinfile: + dest: /etc/dnsmasq.conf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'user', value: 'root' } + - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml new file mode 100644 index 000000000..f05ff660c --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml @@ -0,0 +1,29 @@ +--- + +- name: Link aliases file to postfix aliases + file: + src: '/etc/postfix/aliases' + dest: '/etc/aliases' + state: link + force: yes + when: ansible_os_family == 'Alpine' + +- name: Configure postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}={{ item.value }}' + with_items: + - { key: 'mydestination', value: '' } + - { key: 'message_size_limit', value: '15240000' } + # Hardening + - { key: 'smtp_use_tls', value: 'yes' } + - { key: 'smtp_tls_security_level', value: 'may' } + +- name: Remove dynamic configuration for postfix + lineinfile: + dest: /etc/postfix/main.cf + regexp: '^[\s]*{{ item }}[\s]*=' + state: absent + with_items: + - 'myhostname' diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml new file mode 100644 index 000000000..a69c72633 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml @@ -0,0 +1,12 @@ +--- + +- name: Init ssh privilege separation directory + file: + path: "/var/run/sshd" + state: directory + mode: 0755 + owner: "root" + group: "root" + recurse: yes + + diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml new file mode 100644 index 000000000..cf6968a01 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -0,0 +1,41 @@ +--- + +- name: Move dnsmasq group (Alpine family) + group: + name: dnsmasq + gid: 153 + when: ansible_distribution == 'Alpine' + +- name: Create application group + group: + name: "{{ APPLICATION_GROUP }}" + gid: "{{ APPLICATION_GID }}" + +- name: Create application user + user: + name: "{{ APPLICATION_USER }}" + uid: "{{ APPLICATION_UID }}" + group: "{{ APPLICATION_GROUP }}" + shell: "/bin/bash" + home: "/home/{{ APPLICATION_USER }}" + +- name: Init home directory + file: + path: "/home/{{ APPLICATION_USER }}" + state: directory + mode: 0755 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + recurse: yes + +- name: Init bashrc + lineinfile: + dest: "/home/{{ APPLICATION_USER }}/.bashrc" + mode: 0770 + owner: "{{ APPLICATION_USER }}" + group: "{{ APPLICATION_GROUP }}" + create: yes + regexp: "export TERM=xterm" + line: "export TERM=xterm" + +- action: setup diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/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-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml new file mode 100644 index 000000000..48a7a3abb --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- include: bootstrap/system.yml +- include: bootstrap/misc.yml +- include: bootstrap/root.yml +- include: bootstrap/supervisor.yml +- include: bootstrap/syslog-ng.yml +- include: bootstrap/pam.yml diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml new file mode 100644 index 000000000..4eed695b1 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml @@ -0,0 +1,8 @@ +--- + +- file: + path: "/var/log/wtmp" + state: touch + mode: 0664 + owner: "root" + group: "root" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml new file mode 100644 index 000000000..a18b2412a --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml @@ -0,0 +1,8 @@ +--- + +- name: Ensure su execution [Alpine family] + lineinfile: + dest: "/etc/pam.d/su" + line: "auth sufficient pam_rootok.so" + create: yes + when: ansible_os_family == "Alpine" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml new file mode 100644 index 000000000..29e955fa4 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml @@ -0,0 +1,5 @@ +--- + +- file: + path: "/root/.profile" + state: absent diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml new file mode 100644 index 000000000..bda0394b6 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -0,0 +1,6 @@ +--- + +- name: Remove /usr/sbin/service + file: + path: '/usr/sbin/service' + state: absent diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml new file mode 100644 index 000000000..27c8f6a30 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml @@ -0,0 +1,33 @@ +--- + +- name: Get syslog-ng version + shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." + register: syslogng_version + +- name: Configure syslog-ng (default) + lineinfile: + dest: /etc/default/syslog-ng + regexp: '^[\s]*{{ item.key }}[\s]*=' + line: '{{ item.key }}="{{ item.value }}"' + create: yes + with_items: + - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } + +- name: Enable syslog-ng config + file: + src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' + dest: '/etc/syslog-ng/syslog-ng.conf' + state: link + force: yes + +- name: Set version of syslog-ng file + lineinfile: + dest: '/etc/syslog-ng/syslog-ng.conf' + regexp: '^@version:' + line: '@version: {{ syslogng_version.stdout }}' + +- name: Ensure /var/lib/syslog-ng exists + file: + path: '/var/lib/syslog-ng' + state: directory + recurse: yes diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml new file mode 100644 index 000000000..0741d7cae --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml @@ -0,0 +1,33 @@ +--- + +- name: Create /entrypoint.d + file: + path: "/entrypoint.d" + state: directory + owner: "root" + group: "root" + mode: 0700 + +- name: Create /entrypoint.cmd + file: + src: '/opt/docker/bin/entrypoint.d' + dest: '/entrypoint.cmd' + state: link + force: yes + +- name: Remove system logrotate and cronjobs (not needed) + file: + path: '{{ item }}' + state: absent + with_items: + # Debian/Ubuntu + - /etc/cron.daily/logrotate + - /etc/cron.daily/apt-compat + - /etc/cron.daily/dpkg + - /etc/cron.daily/passwd + # RedHat + - /etc/cron.daily/0yum-daily.cron + - /etc/cron.daily/logrotate + - /etc/cron.hourly/0yum-hourly.cron + # Alpine + - /etc/periodic/daily/logrotate diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build.yml new file mode 100644 index 000000000..cd21505a4 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build.yml @@ -0,0 +1,2 @@ +--- + diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/build/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint.yml @@ -0,0 +1 @@ +--- diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/main.yml new file mode 100644 index 000000000..66fb2e38b --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/main.yml @@ -0,0 +1,13 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap + +- include: build.yml + tags: + - build + +- include: entrypoint.yml + tags: + - entrypoint diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml new file mode 100644 index 000000000..ddd0abbc4 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml @@ -0,0 +1,16 @@ +--- + +- name: Filesystem cleanup [Debian family] + file: + path: "{{ item }}" + state: absent + with_fileglob: + - /var/cache/apt/archives/*.deb + - /var/cache/apt/archives/partial/* + - /var/cache/debconf/*-old + - /var/lib/apt/lists/* + when: ansible_os_family == "Debian" + +- name: Yum cleanup [RedHat family] + command: yum clean all + when: ansible_os_family == "RedHat" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/main.yml new file mode 100644 index 000000000..951b7fc67 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-cleanup/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- include: cleanup.yml + tags: + - bootstrap + - onbuild diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-official/7.1/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-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap.yml new file mode 100644 index 000000000..99a2e5191 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -0,0 +1,10 @@ +--- + +- include: bootstrap/init.yml +- include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml +- include: bootstrap/php-fpm.main.yml +- include: bootstrap/php-fpm.pool.yml +- include: bootstrap/php-fpm.yml diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..df39e4bd4 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,23 @@ +--- + +- 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}}" + +############################# +# PHP +############################# + +- name: Set php main file (official) + set_fact: + php_etc_dir: /usr/local/etc/php + php_main_conf: /usr/local/etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /usr/local/etc/php-fpm.d + php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml new file mode 100644 index 000000000..857983cb3 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -0,0 +1,47 @@ +--- + +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ + +- 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 (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml new file mode 100644 index 000000000..51b884a48 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -0,0 +1,92 @@ +--- + +- 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: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory + +- 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 pool 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 (application.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.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } + - { key: 'slowlog', value: "/docker.stderr" } + - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } + - { key: 'php_admin_value[log_errors]', value: "on" } + - { key: 'user', value: "{{ APPLICATION_USER }}" } + - { key: 'group', value: "{{ APPLICATION_GROUP }}" } + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: + 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-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..41c1b33dc --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,9 @@ +--- + +- name: Symlink php-fpm binary + file: + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" + state: link + owner: "root" + group: "root" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..411e736c8 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,11 @@ +--- + +- name: Link php.ini for cli and fpm [Official PHP] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/conf.d/{{ item.target }}' + force: yes + state: link + with_items: + - { 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' } diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml new file mode 100644 index 000000000..caac8f413 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -0,0 +1,23 @@ +--- + +- 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" diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-official/7.1/conf/provision/variables-webdevops.yml b/docker/php-official/7.1/conf/provision/variables-webdevops.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/7.1/conf/provision/variables-webdevops.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php-official/7.1/conf/provision/variables.yml b/docker/php-official/7.1/conf/provision/variables.yml new file mode 100644 index 000000000..481ee218e --- /dev/null +++ b/docker/php-official/7.1/conf/provision/variables.yml @@ -0,0 +1,7 @@ +--- + +dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" +dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" +dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" +dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" +dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" diff --git a/docker/php/5.6/Dockerfile b/docker/php/5.6/Dockerfile new file mode 100644 index 000000000..d7d66a7e2 --- /dev/null +++ b/docker/php/5.6/Dockerfile @@ -0,0 +1,6 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-official:5.6 diff --git a/docker/php/5.6/Dockerfile.jinja2 b/docker/php/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..8d1973015 --- /dev/null +++ b/docker/php/5.6/Dockerfile.jinja2 @@ -0,0 +1 @@ +{{ docker.from("php-official", "5.6") }} diff --git a/docker/php/7.0/Dockerfile b/docker/php/7.0/Dockerfile new file mode 100644 index 000000000..c2425168b --- /dev/null +++ b/docker/php/7.0/Dockerfile @@ -0,0 +1,6 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-official:7.0 diff --git a/docker/php/7.0/Dockerfile.jinja2 b/docker/php/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..338344d42 --- /dev/null +++ b/docker/php/7.0/Dockerfile.jinja2 @@ -0,0 +1 @@ +{{ docker.from("php-official", "7.0") }} diff --git a/docker/php/7.1/Dockerfile b/docker/php/7.1/Dockerfile new file mode 100644 index 000000000..a2115db33 --- /dev/null +++ b/docker/php/7.1/Dockerfile @@ -0,0 +1,6 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-official:7.1 diff --git a/docker/php/7.1/Dockerfile.jinja2 b/docker/php/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..f136c1425 --- /dev/null +++ b/docker/php/7.1/Dockerfile.jinja2 @@ -0,0 +1 @@ +{{ docker.from("php-official", "7.1") }} diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/alpine-3-php7/conf/etc/logrotate.d/php7-fpm b/docker/php/alpine-3-php7/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/alpine-3-php7/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/alpine-3/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/bin/service.d/php-fpm.sh b/docker/php/centos-7-php56/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- 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 @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) 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 index 1a2c7861f..857983cb3 100644 --- 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 @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) 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 53ee9dfe1..51b884a48 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 @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } 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 index d83edb3ae..41c1b33dc 100644 --- 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 @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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.alpine.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/bootstrap/php.debian.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' 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 index 9816b2538..caac8f413 100644 --- 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 @@ -21,42 +21,3 @@ 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/php5/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-php7/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/centos-7-php7/conf/etc/logrotate.d/php7-fpm b/docker/php/centos-7-php7/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/centos-7-php7/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/conf/bin/service.d/php-fpm.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/debian-7-php7/Dockerfile.disabled b/docker/php/debian-7-php7/Dockerfile.disabled deleted file mode 100644 index 5e830f3e6..000000000 --- a/docker/php/debian-7-php7/Dockerfile.disabled +++ /dev/null @@ -1,47 +0,0 @@ -#++++++++++++++++++++++++++++++++++++++ -# Debian 7 PHP Docker container -#++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:debian-7 -# - -# - -# Install dotdeb -RUN echo "deb http://packages.dotdeb.org wheezy all" >> /etc/apt/sources.list \ - && echo "deb-src http://packages.dotdeb.org wheezy all" >> /etc/apt/sources.list \ - && wget wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add - - -# Install tools -RUN /usr/local/bin/apt-install \ - imagemagick \ - graphicsmagick \ - ghostscript - -# Install php -RUN /usr/local/bin/apt-install \ - php7.0-cli \ - php7.0-fpm \ - php7.0-json \ - php7.0-intl \ - php7.0-curl \ - php7.0-mysql \ - php7.0-mcrypt \ - php7.0-gd \ - php7.0-sqlite3 \ - php7.0-ldap \ - php7.0-opcache \ - php7.0-xmlrpc \ - php7.0-xsl \ - php7.0-bz2 \ - php7.0-redis \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer - -# Deploy scripts/configurations -COPY conf/ /opt/docker/ -RUN bash /opt/docker/bin/control.sh provision.role.bootstrap webdevops-php \ - && bash /opt/docker/bin/bootstrap.sh - -EXPOSE 9000 - -CMD ["supervisord"] diff --git a/docker/php/debian-7-php7/conf/etc/logrotate.d/php7-fpm b/docker/php/debian-7-php7/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/debian-7-php7/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-slow.conf b/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-slow.conf deleted file mode 100644 index c3ea37aa6..000000000 --- a/docker/php/debian-7-php7/conf/etc/supervisor.d/log-php-slow.conf +++ /dev/null @@ -1,8 +0,0 @@ -[program:log-php-slow] -command = bash /opt/docker/bin/logwatch.sh php:slow /var/log/php7-fpm/slow.log -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/debian-7-php7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/debian-7-php7/conf/etc/supervisor.d/php-fpm.conf deleted file mode 100644 index 4725c5e49..000000000 --- a/docker/php/debian-7-php7/conf/etc/supervisor.d/php-fpm.conf +++ /dev/null @@ -1,8 +0,0 @@ -[program:php-fpm] -command = /usr/sbin/php-fpm7.0 --nodaemonize -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/debian-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/debian-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml deleted file mode 100644 index 4523e5a35..000000000 --- a/docker/php/debian-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ /dev/null @@ -1,89 +0,0 @@ ---- - -- name: Set php main file - set_fact: - php_main_conf: /etc/php-fpm.conf - when: ansible_distribution == 'CentOS' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php/7.0/fpm/php-fpm.conf - when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: /etc/php-fpm.d/www.conf - when: ansible_distribution == 'CentOS' - -- name: Set php pool file - set_fact: - php_pool_conf: /etc/php/7.0/fpm/pool.d/www.conf - when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' - -- name: Symlink php-fpm binary - file: - path: "/usr/sbin/php-fpm7.0" - src: "/sbin/php-fpm" - state: link - owner: "root" - group: "root" - when: ansible_distribution == 'CentOS' - -- name: Remove default php-fpm logrotate - file: - path: "/etc/logrotate.d/php-fpm" - state: absent - when: ansible_distribution == 'CentOS' - -- name: Create php-fpm log directory - file: - path: "/var/log/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-fpm/{{ item }}" - state: touch - owner: "root" - group: "root" - mode: 0600 - with_items: - - slow.log - - access.log - - error.log - - fpm.log - - -- name: Configure php-fpm main - lineinfile: - dest: '{{ php_main_conf }}' - regexp: '^[\s;]*{{ item.key }}[\s]*=' - line: '{{ item.key }} = {{ item.value }}' - with_items: - - { key: 'error_log', value: "/var/log/php7-fpm/fpm.log" } - - { key: 'pid', value: "/var/run/php7-fpm.pid" } - -- name: Configure php-fpm pool user (www.conf) - lineinfile: - dest: '{{ php_pool_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/php7-fpm/access.log" } - - { key: 'slowlog', value: "/var/log/php7-fpm/slow.log" } - - { key: 'php_admin_value[error_log]', value: "/var/log/php7-fpm/error.log" } - - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'user', value: "{{ APPLICATION_USER }}" } - - { key: 'group', value: "{{ APPLICATION_GROUP }}" } - -- name: Enable php-fpm connection limit - lineinfile: - dest: '{{ php_pool_conf }}' - regexp: '^[\s;]*{{ item.key }}[\s]*=' - line: ';{{ item.key }}' - with_items: - - { key: 'listen.allowed_clients' } diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/debian-8-php7/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/debian-8-php7/conf/etc/logrotate.d/php7-fpm b/docker/php/debian-8-php7/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/debian-8-php7/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/debian-8/conf/bin/service.d/php-fpm.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/debian-9/conf/bin/service.d/php-fpm.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/debian-9/conf/etc/logrotate.d/php7-fpm b/docker/php/debian-9/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/debian-9/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/ubuntu-12.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh index 1653587a5..e5b667d49 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php5-fpm +exec /usr/local/bin/php-fpm 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/ubuntu-14.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/ubuntu-15.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/ubuntu-15.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/ubuntu-16.04/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php7-fpm b/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/ubuntu-16.04/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/ubuntu-16.10/conf/bin/service.d/php-fpm.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh +++ b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize diff --git a/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php7-fpm b/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/docker/php/ubuntu-16.10/conf/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml index 5883fa1fe..99a2e5191 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap.yml @@ -1,6 +1,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.yml - include: bootstrap/php-fpm.main.yml - include: bootstrap/php-fpm.pool.yml - include: bootstrap/php-fpm.yml diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 36143a96f..857983cb3 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,20 +1,5 @@ --- -- 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/php/7.0/fpm/php-fpm.conf - when: ansible_os_family == 'Debian' - -- name: Set php main file - set_fact: - php_main_conf: /etc/php7/php-fpm.conf - when: ansible_os_family == 'Alpine' - - name: Create php directories file: path: "{{ item }}" @@ -43,11 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) + 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: "/docker.stderr" } + - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) 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: "syslog" } - - { key: 'pid', value: "/var/run/php-fpm.pid" } + - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index d91ecab7f..51b884a48 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,44 +1,18 @@ --- -- 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}}" +- set_fact: + php_clear_env_available: False -- debug: - msg: "PHP-Version: {{php_version}}" +- 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 - 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/php/7.0/fpm/pool.d - when: ansible_os_family == 'Debian' - -- name: Set php pool file - set_fact: - php_pool_conf: www.conf - php_pool_dir: /etc/php7/php-fpm.d - when: ansible_os_family == 'Alpine' - -- name: Create php directories +- name: Create /opt/docker/etc/php/fpm directory file: - path: "{{ item }}" + path: "/opt/docker/etc/php/fpm" state: directory - mode: 0755 - owner: "root" - group: "root" - with_items: - - /opt/docker/etc/php/fpm/ - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -63,8 +37,7 @@ owner: "root" group: "root" - -- name: Configure php-fpm pool user (www.conf) +- name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' @@ -77,10 +50,38 @@ - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } - - { key: 'clear_env', value: "no" } - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + +- 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_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: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index 130542f53..41c1b33dc 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,54 +1,9 @@ --- -- name: Symlink php-fpm binary [RedHat family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" state: link owner: "root" group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-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/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 97f02eec3..caac8f413 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -11,7 +11,7 @@ - /opt/docker/etc/php/ - /opt/docker/etc/php/fpm/ -- name: Create /opt/docker/etc/php/php.ini" +- name: Create php.ini files file: path: "{{ item }}" state: touch @@ -21,40 +21,3 @@ with_items: - "/opt/docker/etc/php/php.webdevops.ini" - "/opt/docker/etc/php/php.ini" - -- name: Link php.ini for cli and fpm - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/provisioning/php/general/bin/service.d/php-fpm.sh b/provisioning/php/general/bin/service.d/php-fpm.sh index 571f248d2..b25983bd3 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php-fpm --nodaemonize +exec /usr/local/bin/php-fpm --nodaemonize 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..99a2e5191 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,10 @@ --- +- include: bootstrap/init.yml - include: bootstrap/php.yml +- include: bootstrap/php.debian.yml +- include: bootstrap/php.redhat.yml +- include: bootstrap/php.alpine.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/init.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..a48bec675 --- /dev/null +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,71 @@ +--- + +- 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}}" + +############################# +# PHP 5.x +############################# + +- name: Set php main file (RedHat, PHP 5.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Debian, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm/pool.d + php_fpm_bin: /usr/sbin/php5-fpm + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 5.x) + set_fact: + php_etc_dir: /etc/php5 + php_main_conf: /etc/php5/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php5/fpm.d + php_fpm_bin: /usr/bin/php-fpm5 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '<') ) + +############################# +# PHP 7.x +############################# + +- name: Set php main file (RedHat, PHP 7.x) + set_fact: + php_main_conf: /etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm + when: ansible_os_family == 'RedHat' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Debian, PHP 7.x) + set_fact: + php_etc_dir: /etc/php/7.0 + php_main_conf: /etc/php/7.0/fpm/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php/7.0/fpm/pool.d + php_fpm_bin: /usr/sbin/php-fpm7.0 + when: ansible_os_family == 'Debian' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) + +- name: Set php main file (Alpine, PHP 7.x) + set_fact: + php_etc_dir: /etc/php7 + php_main_conf: /etc/php7/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /etc/php7/php-fpm.d + php_fpm_bin: /usr/sbin/php-fpm7 + when: ansible_os_family == 'Alpine' and ( php_version | version_compare('7.0.0', '>=') ) and ( php_version | version_compare('8.0.0', '<') ) diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 1a2c7861f..857983cb3 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -1,19 +1,14 @@ --- -- 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/php5/php-fpm.conf - when: ansible_os_family == 'Alpine' +- name: Create php directories + file: + path: "{{ item }}" + state: directory + mode: 0755 + owner: "root" + group: "root" + with_items: + - /opt/docker/etc/php/fpm/ - 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" @@ -33,12 +28,20 @@ owner: "root" group: "root" -- name: Configure php-fpm main +- name: Configure php-fpm main (all versions) 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: "syslog" } + - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } + +- name: Configure php-fpm main (php 5.x) + lineinfile: + dest: '/opt/docker/etc/php/fpm/php-fpm.conf' + regexp: '^[\s;]*{{ item.key }}[\s]*=' + line: '{{ item.key }} = {{ item.value }}' + with_items: - { key: 'daemonize', value: 'no' } + when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 53ee9dfe1..51b884a48 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -1,18 +1,5 @@ --- -- 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}}" - - set_fact: php_clear_env_available: False @@ -22,23 +9,10 @@ ( 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 - 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/php5/fpm.d - when: ansible_os_family == 'Alpine' +- name: Create /opt/docker/etc/php/fpm directory + file: + path: "/opt/docker/etc/php/fpm" + state: directory - name: Move php-fpm pool directory file to /opt/docker/etc/php/ command: "mv {{ php_pool_dir }} /opt/docker/etc/php/fpm/pool.d" @@ -55,7 +29,7 @@ path: "{{ php_pool_dir }}" state: absent -- name: Symlink php-fpm main file +- name: Symlink php-fpm pool file file: path: "{{ php_pool_dir }}" src: "/opt/docker/etc/php/fpm/pool.d" @@ -72,6 +46,7 @@ - { key: 'listen', value: "0.0.0.0:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } + - { key: 'access.log', value: "/docker.stdout" } - { key: 'slowlog', value: "/docker.stderr" } - { key: 'php_admin_value[error_log]', value: "/docker.stderr" } - { key: 'php_admin_value[log_errors]', value: "on" } diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml index d83edb3ae..41c1b33dc 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml @@ -1,45 +1,9 @@ --- -- name: Symlink php-fpm binary [Alpine family] +- name: Symlink php-fpm binary file: - path: "/usr/sbin/php-fpm" - src: "/usr/bin/php-fpm" + path: "/usr/local/bin/php-fpm" + src: "{{ php_fpm_bin }}" 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/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml new file mode 100644 index 000000000..4c16cdf0d --- /dev/null +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml @@ -0,0 +1,12 @@ +--- + +- name: Create link for additional php.ini [Alpine family] + file: + src: '/opt/docker/etc/php/{{ item.file }}' + dest: '{{ php_etc_dir }}/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/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..7d4b72f2a --- /dev/null +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,18 @@ +--- + +- name: Link php.ini for cli and fpm [Debian family] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/{{ 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' diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml new file mode 100644 index 000000000..7e8810231 --- /dev/null +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml @@ -0,0 +1,12 @@ +--- + +- 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' diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.yml index 9816b2538..caac8f413 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.yml @@ -21,42 +21,3 @@ 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/php5/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/provisioning/php/official/provision/roles/webdevops-php/defaults/main.yml b/provisioning/php/official/provision/roles/webdevops-php/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/provisioning/php/official/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/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml new file mode 100644 index 000000000..df39e4bd4 --- /dev/null +++ b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -0,0 +1,23 @@ +--- + +- 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}}" + +############################# +# PHP +############################# + +- name: Set php main file (official) + set_fact: + php_etc_dir: /usr/local/etc/php + php_main_conf: /usr/local/etc/php-fpm.conf + php_pool_conf: www.conf + php_pool_dir: /usr/local/etc/php-fpm.d + php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml new file mode 100644 index 000000000..411e736c8 --- /dev/null +++ b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -0,0 +1,11 @@ +--- + +- name: Link php.ini for cli and fpm [Official PHP] + file: + src: '{{ item.file }}' + dest: '{{ php_etc_dir }}/conf.d/{{ item.target }}' + force: yes + state: link + with_items: + - { 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' } diff --git a/provisioning/php/php7/etc/logrotate.d/php7-fpm b/provisioning/php/php7/etc/logrotate.d/php7-fpm deleted file mode 100644 index 668f2545f..000000000 --- a/provisioning/php/php7/etc/logrotate.d/php7-fpm +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/php7-fpm/fpm.log -/var/log/php7-fpm/access.log -/var/log/php7-fpm/slow.log -/var/log/php7-fpm/error.log { - missingok - notifempty - sharedscripts - delaycompress - postrotate - /bin/kill -SIGUSR1 `cat /var/run/php7-fpm.pid` 2>/dev/null || true - endscript -} diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml deleted file mode 100644 index 130542f53..000000000 --- a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- - -- name: Symlink php-fpm binary [RedHat family] - file: - path: "/usr/sbin/php-fpm7.0" - src: "/usr/sbin/php-fpm" - state: link - owner: "root" - group: "root" - when: ansible_os_family == 'RedHat' - -- name: Symlink php-fpm binary [Alpine family] - file: - path: "/usr/sbin/php-fpm" - src: "/usr/sbin/php-fpm7" - 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/php-fpm7.0" - 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/php7-fpm/" - state: directory - owner: "root" - group: "root" - -- name: Create php-fpm log files - file: - path: "/var/log/php7-fpm/{{ item }}" - state: touch - owner: "root" - group: "root" - mode: 0600 - with_items: - - slow.log - - access.log - - error.log - - fpm.log diff --git a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php.yml deleted file mode 100644 index 97f02eec3..000000000 --- a/provisioning/php/php7/provision/roles/webdevops-php/tasks/bootstrap/php.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- - -- 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 /opt/docker/etc/php/php.ini" - 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 - file: - src: '{{ item.file }}' - dest: '/etc/php/7.0/{{ item.category }}/conf.d/{{ item.target }}' - force: yes - state: link - with_items: - # PHP cli - - { 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: '/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: Link php.ini - file: - src: '/opt/docker/etc/php/{{ item.file }}' - dest: '/etc/php7/conf.d/{{ item.target }}' - force: yes - state: link - 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/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh b/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh index 1653587a5..e5b667d49 100644 --- a/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh +++ b/provisioning/php/ubuntu-12.04/bin/service.d/php-fpm.sh @@ -4,4 +4,4 @@ source /opt/docker/bin/config.sh includeScriptDir "/opt/docker/bin/service.d/php-fpm.d/" -exec /usr/sbin/php5-fpm +exec /usr/local/bin/php-fpm diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 new file mode 100644 index 000000000..1ccb28f5e --- /dev/null +++ b/template/Dockerfile/images/php.jinja2 @@ -0,0 +1,14 @@ +{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/provision.jinja2' as provision %} + +{% macro official(role='') -%} +# Install php environment +RUN /usr/local/bin/apt-install \ + # Install tools + imagemagick \ + graphicsmagick \ + ghostscript \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ provision.runRoleInline('php', role) }} \ + {{ docker.cleanup() }} +{%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 6572ff6df..5c63a31f1 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -14,6 +14,7 @@ {% import 'Dockerfile/images/postfix.jinja2' as postfix %} {% import 'Dockerfile/images/liquidsoap.jinja2' as liquidsoap %} {% import 'Dockerfile/images/mail-sandbox.jinja2' as mailsandbox %} +{% import 'Dockerfile/images/php.jinja2' as php %} {% import 'Dockerfile/images/php5.jinja2' as php5 %} {% import 'Dockerfile/images/php7.jinja2' as php7 %} {% import 'Dockerfile/images/php5-dev.jinja2' as php5dev %} From 93a4fb8cd8a13feaffa32d6b33dd98896f17bff7 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 7 Apr 2017 18:29:42 +0200 Subject: [PATCH 15/58] Fix hhvm tests --- tests/serverspec/spec/shared/hhvm/listening.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/serverspec/spec/shared/hhvm/listening.rb b/tests/serverspec/spec/shared/hhvm/listening.rb index 6d7c204b1..84b874e2f 100644 --- a/tests/serverspec/spec/shared/hhvm/listening.rb +++ b/tests/serverspec/spec/shared/hhvm/listening.rb @@ -1,7 +1,7 @@ shared_examples 'hhvm::listening::public' do describe port(9000) do it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.with('tcp6') + should be_listening.with('tcp') end end end @@ -15,7 +15,7 @@ describe port(9000) do it "hhvm should be listening local", :retry => 20, :retry_wait => 3 do - should be_listening.on('::1').with('tcp6') + should be_listening.on('::1').with('tcp') end end end From afe4e0c0847599c7837580b54755deb8dcb1094f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 7 Apr 2017 18:30:15 +0200 Subject: [PATCH 16/58] Improve liquisoap - Add tests - Add documentation - Fix typos --- docker/liquidsoap/latest/Dockerfile | 24 +++---- docker/liquidsoap/latest/Dockerfile.jinja2 | 24 +++---- .../conf/bin/entrypoint.d/liquidsoap.sh | 4 +- .../latest/conf/etc/liquidsoap/default.liq | 68 ++++++++++--------- .../dockerfiles/include/environment-base.rst | 2 +- .../DockerImages/dockerfiles/liquidsoap.rst | 53 +++++++++++++++ .../docs/content/DockerImages/index.rst | 1 + .../serverspec/spec/collection/liquidsoap.rb | 4 ++ .../serverspec/spec/docker/liquidsoap_spec.rb | 14 ++++ .../spec/shared/liquidsoap/listening.rb | 7 ++ 10 files changed, 141 insertions(+), 60 deletions(-) create mode 100644 documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst create mode 100644 tests/serverspec/spec/collection/liquidsoap.rb create mode 100644 tests/serverspec/spec/docker/liquidsoap_spec.rb create mode 100644 tests/serverspec/spec/shared/liquidsoap/listening.rb diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index abeb074f9..1f5fea890 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -15,27 +15,27 @@ RUN /usr/local/bin/apt-install \ && /usr/local/bin/docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" -ENV LIQUIBASE_TELNET "1" +ENV LIQUIDSOAP_TELNET "1" ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" -ENV LIQUIBASE_STREAM_INPUT "http://icecast:8000/live" +ENV LIQUIDSOAP_STREAM_INPUT "http://icecast:8000/live" -ENV LIQUIBASE_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" +ENV LIQUIDSOAP_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" -ENV LIQUIBASE_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" -ENV LIQUIBASE_PLAYLIST_DAY_TIMERANGE "4h-2h" +ENV LIQUIDSOAP_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" +ENV LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE "4h-2h" -ENV LIQUIBASE_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" -ENV LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE "2h-14h" +ENV LIQUIDSOAP_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" +ENV LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE "2h-14h" -ENV LIQUIBASE_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" +ENV LIQUIDSOAP_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" -ENV LIQUIBASE_META_NAME "Liquidsoap Docker" -ENV LIQUIBASE_META_GENRE "" -ENV LIQUIBASE_META_URL "" -ENV LIQUIBASE_META_DESCRIPTION "" +ENV LIQUIDSOAP_META_NAME "Liquidsoap Docker" +ENV LIQUIDSOAP_META_GENRE "" +ENV LIQUIDSOAP_META_URL "" +ENV LIQUIDSOAP_META_DESCRIPTION "" COPY conf/ /opt/docker/ diff --git a/docker/liquidsoap/latest/Dockerfile.jinja2 b/docker/liquidsoap/latest/Dockerfile.jinja2 index fe7afe459..536adb84c 100644 --- a/docker/liquidsoap/latest/Dockerfile.jinja2 +++ b/docker/liquidsoap/latest/Dockerfile.jinja2 @@ -10,27 +10,27 @@ RUN /usr/local/bin/apt-install \ {{ docker.cleanup() }} ENV LIQUIDSOAP_USER "liquidsoap" -ENV LIQUIBASE_TELNET "1" +ENV LIQUIDSOAP_TELNET "1" ENV LIQUIDSOAP_SCRIPT "/opt/docker/etc/liquidsoap/default.liq" ENV LIQUIDSOAP_TEMPLATE "/opt/docker/etc/liquidsoap/default.liq" -ENV LIQUIBASE_STREAM_INPUT "http://icecast:8000/live" +ENV LIQUIDSOAP_STREAM_INPUT "http://icecast:8000/live" -ENV LIQUIBASE_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" +ENV LIQUIDSOAP_PLAYLIST_DEFAULT "audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))" -ENV LIQUIBASE_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" -ENV LIQUIBASE_PLAYLIST_DAY_TIMERANGE "4h-2h" +ENV LIQUIDSOAP_PLAYLIST_DAY "playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')" +ENV LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE "4h-2h" -ENV LIQUIBASE_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" -ENV LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE "2h-14h" +ENV LIQUIDSOAP_PLAYLIST_NIGHT "playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')" +ENV LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE "2h-14h" -ENV LIQUIBASE_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" +ENV LIQUIDSOAP_OUTPUT "output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)" -ENV LIQUIBASE_META_NAME "Liquidsoap Docker" -ENV LIQUIBASE_META_GENRE "" -ENV LIQUIBASE_META_URL "" -ENV LIQUIBASE_META_DESCRIPTION "" +ENV LIQUIDSOAP_META_NAME "Liquidsoap Docker" +ENV LIQUIDSOAP_META_GENRE "" +ENV LIQUIDSOAP_META_URL "" +ENV LIQUIDSOAP_META_DESCRIPTION "" {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh b/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh index 20825ab0a..1fd1ea972 100644 --- a/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh +++ b/docker/liquidsoap/latest/conf/bin/entrypoint.d/liquidsoap.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash ############################################# -## Configure and run liquibase +## Configure and run liquidsoap ############################################# if [[ -n "$LIQUIDSOAP_TEMPLATE" ]]; then - go-replace --mode=template -s Foobar -r Foobar -- "$LIQUIDSOAP_TEMPLATE" + go-replace --mode=template -- "$LIQUIDSOAP_TEMPLATE" fi exec gosu "$LIQUIDSOAP_USER" liquidsoap "$LIQUIDSOAP_SCRIPT" diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq index 35e6812c7..c848c1e4d 100644 --- a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq +++ b/docker/liquidsoap/latest/conf/etc/liquidsoap/default.liq @@ -10,24 +10,26 @@ set("log.file.path","/dev/null") set("log.stdout", true) # Use the telnet server for requests -{{if .Env.LIQUIBASE_TELNET}} +{{if .Env.LIQUIDSOAP_TELNET}} set("server.telnet", true) +{{else}} +set("server.telnet", false) {{end}} ################## # Settings ################## -DJ_stream = "{{.Env.LIQUIBASE_STREAM_INPUT}}" +DJ_stream = "{{.Env.LIQUIDSOAP_STREAM_INPUT}}" -PLAYLIST_default = {{.Env.LIQUIBASE_PLAYLIST_DEFAULT}} -PLAYLIST_day = {{.Env.LIQUIBASE_PLAYLIST_DAY}} -PLAYLIST_night = {{.Env.LIQUIBASE_PLAYLIST_NIGHT}} +PLAYLIST_default = {{.Env.LIQUIDSOAP_PLAYLIST_DEFAULT}} +PLAYLIST_day = {{.Env.LIQUIDSOAP_PLAYLIST_DAY}} +PLAYLIST_night = {{.Env.LIQUIDSOAP_PLAYLIST_NIGHT}} -META_name = "{{.Env.LIQUIBASE_META_NAME}}" -META_genre = "{{.Env.LIQUIBASE_META_GENRE}}" -META_url = "{{.Env.LIQUIBASE_META_URL}}" -META_desc = "{{.Env.LIQUIBASE_META_DESCRIPTION}}" +META_name = "{{.Env.LIQUIDSOAP_META_NAME}}" +META_genre = "{{.Env.LIQUIDSOAP_META_GENRE}}" +META_url = "{{.Env.LIQUIDSOAP_META_URL}}" +META_desc = "{{.Env.LIQUIDSOAP_META_DESCRIPTION}}" ## fetch dj stream DJ_input = input.http(DJ_stream) @@ -39,8 +41,8 @@ DJ_input = input.http(DJ_stream) # otherwise one of our playlists, # and the default file if anything goes wrong. PLAYLIST_input = fallback([ - switch([({ {{.Env.LIQUIBASE_PLAYLIST_DAY_TIMERANGE}} }, PLAYLIST_day), - ({ {{.Env.LIQUIBASE_PLAYLIST_NIGHT_TIMERANGE}} }, PLAYLIST_night)]), + switch([({ {{.Env.LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE}} }, PLAYLIST_day), + ({ {{.Env.LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE}} }, PLAYLIST_night)]), PLAYLIST_default ]) @@ -51,7 +53,7 @@ PLAYLIST_input = smart_crossfade(fade_out=0.5, fade_in=0.5, PLAYLIST_input) PLAYLIST_input = rewrite_metadata( [ ("title", "$(title)"), - ("comment", "{{.Env.LIQUIBASE_META_URL}}") + ("comment", "{{.Env.LIQUIDSOAP_META_URL}}") ], PLAYLIST_input ) @@ -63,24 +65,24 @@ ALL_input = fallback(track_sensitive=false, [DJ_input, PLAYLIST_input]) # Output ################# -{{.Env.LIQUIBASE_OUTPUT}} -{{.Env.LIQUIBASE_OUTPUT_1}} -{{.Env.LIQUIBASE_OUTPUT_2}} -{{.Env.LIQUIBASE_OUTPUT_3}} -{{.Env.LIQUIBASE_OUTPUT_4}} -{{.Env.LIQUIBASE_OUTPUT_5}} -{{.Env.LIQUIBASE_OUTPUT_6}} -{{.Env.LIQUIBASE_OUTPUT_7}} -{{.Env.LIQUIBASE_OUTPUT_8}} -{{.Env.LIQUIBASE_OUTPUT_9}} -{{.Env.LIQUIBASE_OUTPUT_10}} -{{.Env.LIQUIBASE_OUTPUT_11}} -{{.Env.LIQUIBASE_OUTPUT_12}} -{{.Env.LIQUIBASE_OUTPUT_13}} -{{.Env.LIQUIBASE_OUTPUT_14}} -{{.Env.LIQUIBASE_OUTPUT_15}} -{{.Env.LIQUIBASE_OUTPUT_16}} -{{.Env.LIQUIBASE_OUTPUT_17}} -{{.Env.LIQUIBASE_OUTPUT_18}} -{{.Env.LIQUIBASE_OUTPUT_19}} -{{.Env.LIQUIBASE_OUTPUT_20}} +{{.Env.LIQUIDSOAP_OUTPUT}} +{{.Env.LIQUIDSOAP_OUTPUT_1}} +{{.Env.LIQUIDSOAP_OUTPUT_2}} +{{.Env.LIQUIDSOAP_OUTPUT_3}} +{{.Env.LIQUIDSOAP_OUTPUT_4}} +{{.Env.LIQUIDSOAP_OUTPUT_5}} +{{.Env.LIQUIDSOAP_OUTPUT_6}} +{{.Env.LIQUIDSOAP_OUTPUT_7}} +{{.Env.LIQUIDSOAP_OUTPUT_8}} +{{.Env.LIQUIDSOAP_OUTPUT_9}} +{{.Env.LIQUIDSOAP_OUTPUT_10}} +{{.Env.LIQUIDSOAP_OUTPUT_11}} +{{.Env.LIQUIDSOAP_OUTPUT_12}} +{{.Env.LIQUIDSOAP_OUTPUT_13}} +{{.Env.LIQUIDSOAP_OUTPUT_14}} +{{.Env.LIQUIDSOAP_OUTPUT_15}} +{{.Env.LIQUIDSOAP_OUTPUT_16}} +{{.Env.LIQUIDSOAP_OUTPUT_17}} +{{.Env.LIQUIDSOAP_OUTPUT_18}} +{{.Env.LIQUIDSOAP_OUTPUT_19}} +{{.Env.LIQUIDSOAP_OUTPUT_20}} diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst index d53f797a8..c8c6c2786 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-base.rst @@ -6,4 +6,4 @@ Environment variable Description Default ====================== ============================= ================ ``LOG_STDOUT`` Destination of daemon output *empty* (stdout) ``LOG_STDERR`` Destination of daemon errors *empty* (stdout) -====================== ============================= ================= +====================== ============================= ================ diff --git a/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst b/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst new file mode 100644 index 000000000..cce5083c4 --- /dev/null +++ b/documentation/docs/content/DockerImages/dockerfiles/liquidsoap.rst @@ -0,0 +1,53 @@ +==================== +webdevops/liquidsoap +==================== + +The liquidsoap images are based on ``webdevops/base`` with liquidsoap multimedia streaming server with most plugins. + +Docker image tags +----------------- + +====================== ============================================= +Tag Distribution name +====================== ============================================= +``latest`` Based on `webdevops/base:latest` (Ubuntu) +====================== ============================================= + +Environment variables +--------------------- + +.. include:: include/environment-base.rst + + +Liquisoap environment variables +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +====================================================== ===================================== ============================================== +Environment variable Description Default +====================================================== ===================================== ============================================== +``LIQUIDSOAP_USER`` Daemon user ID ``liquidsoap`` +``LIQUIDSOAP_TELNET`` Open telnet (port 1234) ``1`` (enabled) +``LIQUIDSOAP_SCRIPT`` Configuration script for liquidsoap ``/opt/docker/etc/liquidsoap/default.liq`` +``LIQUIDSOAP_TEMPLATE`` Apply template to config script ``1/opt/docker/etc/liquidsoap/default.liq`` + +``LIQUIDSOAP_STREAM_INPUT`` Input stream (eg. icecast) ``http://icecast:8000/live`` + +``LIQUIDSOAP_PLAYLIST_DEFAULT`` Default stream when no other stream ``audio_to_stereo(single('/opt/docker/etc/liquidsoap/default.mp3'))`` + is active + +``LIQUIDSOAP_PLAYLIST_DAY`` Day input stream/playlist ``playlist('/opt/docker/etc/liquidsoap/playlist-day.pls')`` +``LIQUIDSOAP_PLAYLIST_DAY_TIMERANGE`` Timerange for day playlist ``4h-2h`` + +``LIQUIDSOAP_PLAYLIST_NIGHT`` Night input stream/playlist ``playlist('/opt/docker/etc/liquidsoap/playlist-night.pls')`` +``LIQUIDSOAP_PLAYLIST_NIGHT_TIMERANGE`` Timerange for night playlist ``2h-14h`` + +``LIQUIDSOAP_OUTPUT`` Output stream (eg. icecast) ``output.icecast(%mp3(bitrate=128),host='localhost',port=8000,password='secretpassword',mount='liquidsoap-128',name=META_name,genre=META_genre,url=META_url,description=META_desc,ALL_input)`` + +``LIQUIDSOAP_OUTPUT_1`` ... ``LIQUIDSOAP_OUTPUT_20`` More output stream lines *empty* + + +``LIQUIDSOAP_META_NAME`` Station name ``Liquidsoap Docker`` +``LIQUIDSOAP_META_GENRE`` Station genre *empty* +``LIQUIDSOAP_META_URL`` Station url *empty* +``LIQUIDSOAP_META_DESCRIPTION`` Station description *empty* +====================================================== ===================================== ============================================== + diff --git a/documentation/docs/content/DockerImages/index.rst b/documentation/docs/content/DockerImages/index.rst index b9066e142..33c711543 100644 --- a/documentation/docs/content/DockerImages/index.rst +++ b/documentation/docs/content/DockerImages/index.rst @@ -23,6 +23,7 @@ Docker images dockerfiles/hhvm-apache dockerfiles/hhvm-nginx dockerfiles/liquibase + dockerfiles/liquidsoap dockerfiles/mail-sandbox dockerfiles/nginx dockerfiles/nginx-dev diff --git a/tests/serverspec/spec/collection/liquidsoap.rb b/tests/serverspec/spec/collection/liquidsoap.rb new file mode 100644 index 000000000..6be2c4ef2 --- /dev/null +++ b/tests/serverspec/spec/collection/liquidsoap.rb @@ -0,0 +1,4 @@ +shared_examples 'collection::liquidsoap' do + include_examples 'liquidsoap::listening::public' +end + diff --git a/tests/serverspec/spec/docker/liquidsoap_spec.rb b/tests/serverspec/spec/docker/liquidsoap_spec.rb new file mode 100644 index 000000000..be66c975e --- /dev/null +++ b/tests/serverspec/spec/docker/liquidsoap_spec.rb @@ -0,0 +1,14 @@ +require 'serverspec' +require 'docker' +require 'spec_init' + +describe "Dockerfile" do + before(:all) do + set :docker_image, ENV['DOCKERIMAGE_ID'] + end + + include_examples 'collection::bootstrap' + include_examples 'collection::base' + include_examples 'collection::liquidsoap' + +end diff --git a/tests/serverspec/spec/shared/liquidsoap/listening.rb b/tests/serverspec/spec/shared/liquidsoap/listening.rb new file mode 100644 index 000000000..1ff02588c --- /dev/null +++ b/tests/serverspec/spec/shared/liquidsoap/listening.rb @@ -0,0 +1,7 @@ +shared_examples 'liquidsoap::listening::public' do + describe port(1234) do + it "hhvm should be listening", :retry => 20, :retry_wait => 3 do + should be_listening.with('tcp') + end + end +end From ead63f73baa5c2a7e6b1da7010f5b72f268a57c4 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 5 Apr 2017 00:30:22 +0200 Subject: [PATCH 17/58] Cleanup images - Remove ssh, cron and other services - Install them autoamtically if enabled (eg. in Dockerfiles) --- docker/base-app/alpine-3/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/centos-7/Dockerfile | 5 -- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/debian-7/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/debian-8/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/debian-9/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-12.04/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-14.04/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-15.04/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-15.10/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-16.04/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base-app/ubuntu-16.10/Dockerfile | 6 --- .../conf/bin/service.d/ssh.d/10-init.sh | 2 - .../conf/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- docker/base/alpine-3/conf/bin/config.sh | 5 ++ docker/base/alpine-3/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../alpine-3/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../alpine-3/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../alpine-3/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../conf/etc/supervisor.d/postfix.conf | 0 .../alpine-3/conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../alpine-3/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../alpine-3/conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/centos-7/Dockerfile | 1 - docker/base/centos-7/conf/bin/config.sh | 5 ++ docker/base/centos-7/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../centos-7/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../centos-7/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../centos-7/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../conf/etc/supervisor.d/postfix.conf | 0 .../centos-7/conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../centos-7/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../centos-7/conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/debian-7/Dockerfile | 1 - docker/base/debian-7/conf/bin/config.sh | 5 ++ docker/base/debian-7/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../debian-7/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../debian-7/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../debian-7/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../conf/etc/supervisor.d/postfix.conf | 0 .../debian-7/conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-7/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../debian-7/conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/debian-8/Dockerfile | 1 - docker/base/debian-8/conf/bin/config.sh | 5 ++ docker/base/debian-8/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../debian-8/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../debian-8/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../debian-8/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../conf/etc/supervisor.d/postfix.conf | 0 .../debian-8/conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-8/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../debian-8/conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/debian-9/Dockerfile | 1 - docker/base/debian-9/conf/bin/config.sh | 5 ++ docker/base/debian-9/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../debian-9/conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../debian-9/conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../debian-9/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../debian-9/conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../debian-9/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../debian-9/conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-12.04/Dockerfile | 1 - docker/base/ubuntu-12.04/conf/bin/config.sh | 5 ++ docker/base/ubuntu-12.04/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-12.04/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-14.04/Dockerfile | 1 - docker/base/ubuntu-14.04/conf/bin/config.sh | 5 ++ docker/base/ubuntu-14.04/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-14.04/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-15.04/Dockerfile | 1 - docker/base/ubuntu-15.04/conf/bin/config.sh | 5 ++ docker/base/ubuntu-15.04/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-15.04/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-15.10/Dockerfile | 1 - docker/base/ubuntu-15.10/conf/bin/config.sh | 5 ++ docker/base/ubuntu-15.10/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-15.10/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-16.04/Dockerfile | 1 - docker/base/ubuntu-16.04/conf/bin/config.sh | 5 ++ docker/base/ubuntu-16.04/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-16.04/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/base/ubuntu-16.10/Dockerfile | 1 - docker/base/ubuntu-16.10/conf/bin/config.sh | 5 ++ docker/base/ubuntu-16.10/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 7 +++ .../ubuntu-16.10/conf/bin/service.d/ssh.sh | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../conf/provision/service.d/ssh.sh | 15 ++++++ docker/php-dev/alpine-3-php7/Dockerfile | 3 ++ docker/php-dev/alpine-3/Dockerfile | 3 ++ docker/php-dev/centos-7-php56/Dockerfile | 3 ++ docker/php-dev/centos-7-php7/Dockerfile | 3 ++ docker/php-dev/centos-7/Dockerfile | 3 ++ docker/php-dev/debian-7/Dockerfile | 3 ++ docker/php-dev/debian-8-php7/Dockerfile | 3 ++ docker/php-dev/debian-8/Dockerfile | 3 ++ docker/php-dev/debian-9/Dockerfile | 3 ++ docker/php-dev/ubuntu-12.04/Dockerfile | 3 ++ docker/php-dev/ubuntu-14.04/Dockerfile | 3 ++ docker/php-dev/ubuntu-15.04/Dockerfile | 3 ++ docker/php-dev/ubuntu-15.10/Dockerfile | 3 ++ docker/php-dev/ubuntu-16.04/Dockerfile | 3 ++ docker/php-dev/ubuntu-16.10/Dockerfile | 3 ++ docker/php/alpine-3-php7/Dockerfile | 2 + docker/php/alpine-3/Dockerfile | 2 + docker/php/centos-7-php56/Dockerfile | 2 + docker/php/centos-7-php7/Dockerfile | 2 + docker/php/centos-7/Dockerfile | 2 + docker/php/debian-7/Dockerfile | 2 + docker/php/debian-8-php7/Dockerfile | 2 + docker/php/debian-8/Dockerfile | 2 + docker/php/debian-9/Dockerfile | 2 + docker/php/ubuntu-12.04/Dockerfile | 2 + docker/php/ubuntu-14.04/Dockerfile | 2 + docker/php/ubuntu-15.04/Dockerfile | 2 + docker/php/ubuntu-15.10/Dockerfile | 2 + docker/php/ubuntu-16.04/Dockerfile | 2 + docker/php/ubuntu-16.10/Dockerfile | 2 + docker/samson-deployment/latest/Dockerfile | 7 --- .../latest/conf/bin/config.sh | 5 ++ .../latest/conf/bin/control.sh | 28 +++++++++-- .../conf/bin/service.d/ssh.d/10-init.sh | 5 ++ .../latest/conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- .../latest/conf/provision/service.d/.gitkeep | 0 .../latest/conf/provision/service.d/cron.sh | 11 +++++ .../conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../latest/conf/provision/service.d/ssh.sh | 15 ++++++ .../general/bin/service.d/ssh.d/10-init.sh | 2 - .../general/etc/supervisor.d/dnsmasq.conf | 14 ------ .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- provisioning/base/general/bin/config.sh | 5 ++ provisioning/base/general/bin/control.sh | 28 +++++++++-- .../bin/service.d/dnsmasq.d/10-init.sh | 0 .../general/bin/service.d/dnsmasq.sh | 0 .../bin/service.d/postfix.d/10-init.sh | 0 .../general/bin/service.d/postfix.sh | 0 .../general/bin/service.d/ssh.d/10-init.sh | 7 +++ .../general/bin/service.d/ssh.sh | 0 .../general/etc/supervisor.d/dnsmasq.conf | 14 ++++++ .../general/etc/supervisor.d/postfix.conf | 0 .../general/etc/supervisor.d/ssh.conf | 0 .../base/general/provision/service.d/.gitkeep | 0 .../base/general/provision/service.d/cron.sh | 11 +++++ .../general/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../general/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../base/general/provision/service.d/ssh.sh | 15 ++++++ template/Dockerfile/images/base.jinja2 | 3 -- template/Dockerfile/images/baseapp.jinja2 | 29 ----------- template/Dockerfile/images/php5-dev.jinja2 | 9 +++- template/Dockerfile/images/php5.jinja2 | 12 ++++- template/Dockerfile/images/php7-dev.jinja2 | 10 +++- template/Dockerfile/images/php7.jinja2 | 9 +++- template/Dockerfile/layout.jinja2 | 1 + template/Dockerfile/services.jinja2 | 11 +++++ 346 files changed, 2058 insertions(+), 1091 deletions(-) delete mode 100644 docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml delete mode 100644 docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh delete mode 100644 docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf delete mode 100644 docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml rename docker/{base-app => base}/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/alpine-3/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/alpine-3/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/alpine-3/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/alpine-3/conf/bin/service.d/ssh.sh (100%) rename docker/{base-app/debian-7 => base/alpine-3}/conf/etc/supervisor.d/dnsmasq.conf (94%) rename docker/{base-app => base}/alpine-3/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/alpine-3/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/alpine-3/conf/provision/service.d/.gitkeep create mode 100644 docker/base/alpine-3/conf/provision/service.d/cron.sh create mode 100644 docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/alpine-3/conf/provision/service.d/postfix.sh create mode 100644 docker/base/alpine-3/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/centos-7/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/centos-7/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/centos-7/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/centos-7/conf/bin/service.d/ssh.sh (100%) rename docker/{base-app/alpine-3 => base/centos-7}/conf/etc/supervisor.d/dnsmasq.conf (94%) rename docker/{base-app => base}/centos-7/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/centos-7/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/centos-7/conf/provision/service.d/.gitkeep create mode 100644 docker/base/centos-7/conf/provision/service.d/cron.sh create mode 100644 docker/base/centos-7/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/centos-7/conf/provision/service.d/postfix.sh create mode 100644 docker/base/centos-7/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/debian-7/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/debian-7/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/debian-7/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/debian-7/conf/bin/service.d/ssh.sh (100%) rename docker/{base-app/debian-8 => base/debian-7}/conf/etc/supervisor.d/dnsmasq.conf (94%) rename docker/{base-app => base}/debian-7/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/debian-7/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/debian-7/conf/provision/service.d/.gitkeep create mode 100644 docker/base/debian-7/conf/provision/service.d/cron.sh create mode 100644 docker/base/debian-7/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/debian-7/conf/provision/service.d/postfix.sh create mode 100644 docker/base/debian-7/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/debian-8/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/debian-8/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/debian-8/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/debian-8/conf/bin/service.d/ssh.sh (100%) rename docker/{base-app/centos-7 => base/debian-8}/conf/etc/supervisor.d/dnsmasq.conf (94%) rename docker/{base-app => base}/debian-8/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/debian-8/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/debian-8/conf/provision/service.d/.gitkeep create mode 100644 docker/base/debian-8/conf/provision/service.d/cron.sh create mode 100644 docker/base/debian-8/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/debian-8/conf/provision/service.d/postfix.sh create mode 100644 docker/base/debian-8/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/debian-9/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/debian-9/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/debian-9/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/debian-9/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/debian-9/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/debian-9/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/debian-9/conf/provision/service.d/.gitkeep create mode 100644 docker/base/debian-9/conf/provision/service.d/cron.sh create mode 100644 docker/base/debian-9/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/debian-9/conf/provision/service.d/postfix.sh create mode 100644 docker/base/debian-9/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-12.04/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-12.04/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-14.04/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-14.04/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-15.04/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-15.04/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-15.10/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-15.10/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-16.04/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-16.04/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh rename docker/{base-app => base}/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh (100%) rename docker/{base-app => base}/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/{base-app => base}/ubuntu-16.10/conf/bin/service.d/postfix.sh (100%) create mode 100644 docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh rename docker/{base-app => base}/ubuntu-16.10/conf/bin/service.d/ssh.sh (100%) create mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf rename docker/{base-app => base}/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf (100%) rename docker/{base-app => base}/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf (100%) create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/.gitkeep create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/cron.sh create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/postfix.sh create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/ssh.sh delete mode 100644 provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh delete mode 100644 provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf delete mode 100644 provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml rename provisioning/{base-app => base}/general/bin/service.d/dnsmasq.d/10-init.sh (100%) rename provisioning/{base-app => base}/general/bin/service.d/dnsmasq.sh (100%) rename provisioning/{base-app => base}/general/bin/service.d/postfix.d/10-init.sh (100%) rename provisioning/{base-app => base}/general/bin/service.d/postfix.sh (100%) create mode 100644 provisioning/base/general/bin/service.d/ssh.d/10-init.sh rename provisioning/{base-app => base}/general/bin/service.d/ssh.sh (100%) create mode 100644 provisioning/base/general/etc/supervisor.d/dnsmasq.conf rename provisioning/{base-app => base}/general/etc/supervisor.d/postfix.conf (100%) rename provisioning/{base-app => base}/general/etc/supervisor.d/ssh.conf (100%) create mode 100644 provisioning/base/general/provision/service.d/.gitkeep create mode 100644 provisioning/base/general/provision/service.d/cron.sh create mode 100644 provisioning/base/general/provision/service.d/dnsmasq.sh create mode 100644 provisioning/base/general/provision/service.d/postfix.sh create mode 100644 provisioning/base/general/provision/service.d/ssh.sh create mode 100644 template/Dockerfile/services.jinja2 diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 8ac31c244..3b81601b3 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install-edge shadow \ && /usr/local/bin/apk-install \ - # Install services - openssh \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index d0fe76aa2..5d0fe021e 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -20,11 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/yum-install \ - openssh-server \ - mysql \ - sqlite \ - dnsmasq \ - postfix \ # Install tools sudo \ zip \ diff --git a/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 2ea2f3080..3a8eb03bd 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 577abd5e4..5af3ae09d 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/debian-8/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 04af72f16..b15da2f43 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mariadb-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/debian-9/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/debian-9/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index ec646eab2..24aa1001b 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-12.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 6bdc87279..521a01cb7 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-14.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 8d2cbf418..629c5839a 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-15.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index ea2eedcc3..950172ad9 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-15.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 70c49b03c..a883e7b6f 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-16.04/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index b45b98834..ea94fb95e 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -20,12 +20,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/base-app/ubuntu-16.10/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/base/alpine-3/conf/bin/config.sh b/docker/base/alpine-3/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/alpine-3/conf/bin/config.sh +++ b/docker/base/alpine-3/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/alpine-3/conf/bin/control.sh b/docker/base/alpine-3/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/alpine-3/conf/bin/control.sh +++ b/docker/base/alpine-3/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.sh b/docker/base/alpine-3/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.sh rename to docker/base/alpine-3/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine-3/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/alpine-3/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/alpine-3/conf/bin/service.d/postfix.sh b/docker/base/alpine-3/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/alpine-3/conf/bin/service.d/postfix.sh rename to docker/base/alpine-3/conf/bin/service.d/postfix.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/alpine-3/conf/bin/service.d/ssh.sh b/docker/base/alpine-3/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/alpine-3/conf/bin/service.d/ssh.sh rename to docker/base/alpine-3/conf/bin/service.d/ssh.sh diff --git a/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/alpine-3/conf/etc/supervisor.d/dnsmasq.conf similarity index 94% rename from docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/alpine-3/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/base-app/debian-7/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base/alpine-3/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/alpine-3/conf/etc/supervisor.d/postfix.conf b/docker/base/alpine-3/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/alpine-3/conf/etc/supervisor.d/postfix.conf rename to docker/base/alpine-3/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/alpine-3/conf/etc/supervisor.d/ssh.conf b/docker/base/alpine-3/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/alpine-3/conf/etc/supervisor.d/ssh.conf rename to docker/base/alpine-3/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/alpine-3/conf/provision/service.d/.gitkeep b/docker/base/alpine-3/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/alpine-3/conf/provision/service.d/cron.sh b/docker/base/alpine-3/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/alpine-3/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/alpine-3/conf/provision/service.d/postfix.sh b/docker/base/alpine-3/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/alpine-3/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/alpine-3/conf/provision/service.d/ssh.sh b/docker/base/alpine-3/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/alpine-3/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index f186ac452..fbe86fdcd 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -42,7 +42,6 @@ RUN /usr/local/bin/yum-install \ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ python \ - cronie \ supervisor \ syslog-ng \ wget \ diff --git a/docker/base/centos-7/conf/bin/config.sh b/docker/base/centos-7/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/centos-7/conf/bin/config.sh +++ b/docker/base/centos-7/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/centos-7/conf/bin/control.sh b/docker/base/centos-7/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/centos-7/conf/bin/control.sh +++ b/docker/base/centos-7/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.sh b/docker/base/centos-7/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/centos-7/conf/bin/service.d/dnsmasq.sh rename to docker/base/centos-7/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/centos-7/conf/bin/service.d/postfix.sh b/docker/base/centos-7/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/centos-7/conf/bin/service.d/postfix.sh rename to docker/base/centos-7/conf/bin/service.d/postfix.sh diff --git a/docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/centos-7/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/centos-7/conf/bin/service.d/ssh.sh b/docker/base/centos-7/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/centos-7/conf/bin/service.d/ssh.sh rename to docker/base/centos-7/conf/bin/service.d/ssh.sh diff --git a/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/centos-7/conf/etc/supervisor.d/dnsmasq.conf similarity index 94% rename from docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/centos-7/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base/centos-7/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/centos-7/conf/etc/supervisor.d/postfix.conf b/docker/base/centos-7/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/centos-7/conf/etc/supervisor.d/postfix.conf rename to docker/base/centos-7/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/centos-7/conf/etc/supervisor.d/ssh.conf b/docker/base/centos-7/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/centos-7/conf/etc/supervisor.d/ssh.conf rename to docker/base/centos-7/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/centos-7/conf/provision/service.d/.gitkeep b/docker/base/centos-7/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/centos-7/conf/provision/service.d/cron.sh b/docker/base/centos-7/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/centos-7/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/centos-7/conf/provision/service.d/postfix.sh b/docker/base/centos-7/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/centos-7/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/centos-7/conf/provision/service.d/ssh.sh b/docker/base/centos-7/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/centos-7/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index ef4fa818c..272b46278 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -47,7 +47,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/debian-7/conf/bin/config.sh b/docker/base/debian-7/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/debian-7/conf/bin/config.sh +++ b/docker/base/debian-7/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/base/debian-7/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/debian-7/conf/bin/control.sh +++ b/docker/base/debian-7/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/debian-7/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-7/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/debian-7/conf/bin/service.d/dnsmasq.sh rename to docker/base/debian-7/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/debian-7/conf/bin/service.d/postfix.sh b/docker/base/debian-7/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/debian-7/conf/bin/service.d/postfix.sh rename to docker/base/debian-7/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-7/conf/bin/service.d/ssh.sh b/docker/base/debian-7/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/debian-7/conf/bin/service.d/ssh.sh rename to docker/base/debian-7/conf/bin/service.d/ssh.sh diff --git a/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf similarity index 94% rename from docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/base-app/debian-8/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/debian-7/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-7/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/debian-7/conf/etc/supervisor.d/postfix.conf rename to docker/base/debian-7/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/debian-7/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-7/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/debian-7/conf/etc/supervisor.d/ssh.conf rename to docker/base/debian-7/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-7/conf/provision/service.d/.gitkeep b/docker/base/debian-7/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-7/conf/provision/service.d/cron.sh b/docker/base/debian-7/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/debian-7/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/debian-7/conf/provision/service.d/postfix.sh b/docker/base/debian-7/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/debian-7/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/debian-7/conf/provision/service.d/ssh.sh b/docker/base/debian-7/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/debian-7/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 986983d1f..10d6ea12d 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -47,7 +47,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/debian-8/conf/bin/config.sh b/docker/base/debian-8/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/debian-8/conf/bin/config.sh +++ b/docker/base/debian-8/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/base/debian-8/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/debian-8/conf/bin/control.sh +++ b/docker/base/debian-8/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/debian-8/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-8/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/debian-8/conf/bin/service.d/dnsmasq.sh rename to docker/base/debian-8/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/debian-8/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/debian-8/conf/bin/service.d/postfix.sh b/docker/base/debian-8/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/debian-8/conf/bin/service.d/postfix.sh rename to docker/base/debian-8/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-8/conf/bin/service.d/ssh.sh b/docker/base/debian-8/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/debian-8/conf/bin/service.d/ssh.sh rename to docker/base/debian-8/conf/bin/service.d/ssh.sh diff --git a/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf similarity index 94% rename from docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base-app/debian-8/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-8/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/debian-8/conf/etc/supervisor.d/postfix.conf rename to docker/base/debian-8/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/debian-8/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-8/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/debian-8/conf/etc/supervisor.d/ssh.conf rename to docker/base/debian-8/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-8/conf/provision/service.d/.gitkeep b/docker/base/debian-8/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-8/conf/provision/service.d/cron.sh b/docker/base/debian-8/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/debian-8/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/debian-8/conf/provision/service.d/postfix.sh b/docker/base/debian-8/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/debian-8/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/debian-8/conf/provision/service.d/ssh.sh b/docker/base/debian-8/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/debian-8/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index e280ba432..00c83040d 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -47,7 +47,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/debian-9/conf/bin/config.sh b/docker/base/debian-9/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/debian-9/conf/bin/config.sh +++ b/docker/base/debian-9/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/base/debian-9/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/debian-9/conf/bin/control.sh +++ b/docker/base/debian-9/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/debian-9/conf/bin/service.d/dnsmasq.sh b/docker/base/debian-9/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/debian-9/conf/bin/service.d/dnsmasq.sh rename to docker/base/debian-9/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/debian-9/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/debian-9/conf/bin/service.d/postfix.sh b/docker/base/debian-9/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/debian-9/conf/bin/service.d/postfix.sh rename to docker/base/debian-9/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/debian-9/conf/bin/service.d/ssh.sh b/docker/base/debian-9/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/debian-9/conf/bin/service.d/ssh.sh rename to docker/base/debian-9/conf/bin/service.d/ssh.sh diff --git a/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/debian-9/conf/etc/supervisor.d/postfix.conf b/docker/base/debian-9/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/debian-9/conf/etc/supervisor.d/postfix.conf rename to docker/base/debian-9/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/debian-9/conf/etc/supervisor.d/ssh.conf b/docker/base/debian-9/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/debian-9/conf/etc/supervisor.d/ssh.conf rename to docker/base/debian-9/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-9/conf/provision/service.d/.gitkeep b/docker/base/debian-9/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/debian-9/conf/provision/service.d/cron.sh b/docker/base/debian-9/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/debian-9/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/debian-9/conf/provision/service.d/postfix.sh b/docker/base/debian-9/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/debian-9/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/debian-9/conf/provision/service.d/ssh.sh b/docker/base/debian-9/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/debian-9/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 8eea7900a..6099bbf1b 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-12.04/conf/bin/config.sh b/docker/base/ubuntu-12.04/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-12.04/conf/bin/config.sh +++ b/docker/base/ubuntu-12.04/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/base/ubuntu-12.04/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-12.04/conf/bin/control.sh +++ b/docker/base/ubuntu-12.04/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 73e23f820..4328a154d 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-14.04/conf/bin/config.sh b/docker/base/ubuntu-14.04/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-14.04/conf/bin/config.sh +++ b/docker/base/ubuntu-14.04/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/base/ubuntu-14.04/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-14.04/conf/bin/control.sh +++ b/docker/base/ubuntu-14.04/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 6c696ac1e..3718f10a8 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-15.04/conf/bin/config.sh b/docker/base/ubuntu-15.04/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-15.04/conf/bin/config.sh +++ b/docker/base/ubuntu-15.04/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-15.04/conf/bin/control.sh b/docker/base/ubuntu-15.04/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-15.04/conf/bin/control.sh +++ b/docker/base/ubuntu-15.04/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-15.04/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-15.04/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-15.04/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-15.04/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-15.04/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index ab9b12cc0..97bdca1b7 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-15.10/conf/bin/config.sh b/docker/base/ubuntu-15.10/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-15.10/conf/bin/config.sh +++ b/docker/base/ubuntu-15.10/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-15.10/conf/bin/control.sh b/docker/base/ubuntu-15.10/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-15.10/conf/bin/control.sh +++ b/docker/base/ubuntu-15.10/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-15.10/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-15.10/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-15.10/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-15.10/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-15.10/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index b98c40a8f..d1aabea4d 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-16.04/conf/bin/config.sh b/docker/base/ubuntu-16.04/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-16.04/conf/bin/config.sh +++ b/docker/base/ubuntu-16.04/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-16.04/conf/bin/control.sh b/docker/base/ubuntu-16.04/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-16.04/conf/bin/control.sh +++ b/docker/base/ubuntu-16.04/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-16.04/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-16.04/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-16.04/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-16.04/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-16.04/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 8231613ae..3f591b732 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -46,7 +46,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/docker/base/ubuntu-16.10/conf/bin/config.sh b/docker/base/ubuntu-16.10/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/base/ubuntu-16.10/conf/bin/config.sh +++ b/docker/base/ubuntu-16.10/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/base/ubuntu-16.10/conf/bin/control.sh b/docker/base/ubuntu-16.10/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/base/ubuntu-16.10/conf/bin/control.sh +++ b/docker/base/ubuntu-16.10/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh rename to docker/base/ubuntu-16.10/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/bin/service.d/postfix.sh rename to docker/base/ubuntu-16.10/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/bin/service.d/ssh.sh rename to docker/base/ubuntu-16.10/conf/bin/service.d/ssh.sh diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf rename to docker/base/ubuntu-16.10/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base-app/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf rename to docker/base/ubuntu-16.10/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep b/docker/base/ubuntu-16.10/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 69189b9ce..900accc23 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -18,6 +18,9 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index f7815ec2f..3af7f0733 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -18,6 +18,9 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index 2d4d84b90..d5136587d 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -20,6 +20,9 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index f7d659988..14d1f6ea7 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -20,6 +20,9 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php70w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index ed021f841..9ef8fc6e3 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -21,6 +21,9 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index d4ea34821..bce399c44 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index a6df9d226..04f4879f5 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 1ae296973..d9bb70368 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 7f1daae72..2924edbcc 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index f73d8e1d0..9ff0f9e1e 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index d7e2d5712..f5f16957c 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 240f389f5..b27f71f34 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 3c5cf2908..39b090ebf 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 6d574de82..8f2086dd0 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index ad3e305e9..2225e8908 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -22,6 +22,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 22b0a1428..ed379fec1 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -77,6 +77,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 7fc09173f..334c09d58 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -72,6 +72,8 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 2cba1c770..267e6b5fd 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -53,6 +53,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index ba5fb576d..26677872d 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -60,6 +60,8 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && rm -rf /tmp/* \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index b00393749..aa9061b03 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -57,6 +57,8 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 75c17ec70..21ac14116 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -46,6 +46,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 9d237a0e1..40dd19ae1 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -57,6 +57,8 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-mbstring \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index e89050d6a..b00ff7b21 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -48,6 +48,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index fc85e8143..0be8a4754 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -46,6 +46,8 @@ RUN /usr/local/bin/apt-install \ php-memcache \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index c9f7e28e9..cc1f75cac 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -47,6 +47,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 52c63a949..03850bb42 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -48,6 +48,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 4455b699b..bff4ccd18 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -48,6 +48,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index f428d4014..d6adbee4e 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -48,6 +48,8 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 107df430f..783497d48 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -45,6 +45,8 @@ RUN /usr/local/bin/apt-install \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 7c76f4841..edabf542a 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -45,6 +45,8 @@ RUN /usr/local/bin/apt-install \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + # Enable php services + && /opt/docker/bin/control.sh service.enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 01599a897..4798a6e73 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -100,7 +100,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ @@ -122,12 +121,6 @@ ENV APPLICATION_GID 1000 # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/samson-deployment/latest/conf/bin/config.sh b/docker/samson-deployment/latest/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/samson-deployment/latest/conf/bin/config.sh +++ b/docker/samson-deployment/latest/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/samson-deployment/latest/conf/bin/control.sh b/docker/samson-deployment/latest/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/samson-deployment/latest/conf/bin/control.sh +++ b/docker/samson-deployment/latest/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh b/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh index e3192fe01..f2b600312 100644 --- a/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/samson-deployment/latest/conf/bin/service.d/ssh.d/10-init.sh @@ -1,2 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + # generate host keys ssh-keygen -A diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/samson-deployment/latest/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/samson-deployment/latest/conf/provision/service.d/.gitkeep b/docker/samson-deployment/latest/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/samson-deployment/latest/conf/provision/service.d/cron.sh b/docker/samson-deployment/latest/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh b/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh b/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh deleted file mode 100644 index e3192fe01..000000000 --- a/provisioning/base-app/general/bin/service.d/ssh.d/10-init.sh +++ /dev/null @@ -1,2 +0,0 @@ -# generate host keys -ssh-keygen -A diff --git a/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf b/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf deleted file mode 100644 index a0ad2de88..000000000 --- a/provisioning/base-app/general/etc/supervisor.d/dnsmasq.conf +++ /dev/null @@ -1,14 +0,0 @@ -[group:dnsmasq] -programs=dnsmasqd -priority=15 - -[program:dnsmasqd] -command = /opt/docker/bin/service.d/dnsmasq.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/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/provisioning/base-app/general/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/provisioning/base/general/bin/config.sh b/provisioning/base/general/bin/config.sh index 3155728e8..8a399464a 100644 --- a/provisioning/base/general/bin/config.sh +++ b/provisioning/base/general/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/provisioning/base/general/bin/control.sh b/provisioning/base/general/bin/control.sh index a6697092d..c93c963f9 100644 --- a/provisioning/base/general/bin/control.sh +++ b/provisioning/base/general/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh b/provisioning/base/general/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from provisioning/base-app/general/bin/service.d/dnsmasq.d/10-init.sh rename to provisioning/base/general/bin/service.d/dnsmasq.d/10-init.sh diff --git a/provisioning/base-app/general/bin/service.d/dnsmasq.sh b/provisioning/base/general/bin/service.d/dnsmasq.sh similarity index 100% rename from provisioning/base-app/general/bin/service.d/dnsmasq.sh rename to provisioning/base/general/bin/service.d/dnsmasq.sh diff --git a/provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh b/provisioning/base/general/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from provisioning/base-app/general/bin/service.d/postfix.d/10-init.sh rename to provisioning/base/general/bin/service.d/postfix.d/10-init.sh diff --git a/provisioning/base-app/general/bin/service.d/postfix.sh b/provisioning/base/general/bin/service.d/postfix.sh similarity index 100% rename from provisioning/base-app/general/bin/service.d/postfix.sh rename to provisioning/base/general/bin/service.d/postfix.sh diff --git a/provisioning/base/general/bin/service.d/ssh.d/10-init.sh b/provisioning/base/general/bin/service.d/ssh.d/10-init.sh new file mode 100644 index 000000000..f2b600312 --- /dev/null +++ b/provisioning/base/general/bin/service.d/ssh.d/10-init.sh @@ -0,0 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + +# generate host keys +ssh-keygen -A diff --git a/provisioning/base-app/general/bin/service.d/ssh.sh b/provisioning/base/general/bin/service.d/ssh.sh similarity index 100% rename from provisioning/base-app/general/bin/service.d/ssh.sh rename to provisioning/base/general/bin/service.d/ssh.sh diff --git a/provisioning/base/general/etc/supervisor.d/dnsmasq.conf b/provisioning/base/general/etc/supervisor.d/dnsmasq.conf new file mode 100644 index 000000000..9832ffca7 --- /dev/null +++ b/provisioning/base/general/etc/supervisor.d/dnsmasq.conf @@ -0,0 +1,14 @@ +[group:dnsmasq] +programs=dnsmasqd +priority=15 + +[program:dnsmasqd] +command = /opt/docker/bin/service.d/dnsmasq.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/provisioning/base-app/general/etc/supervisor.d/postfix.conf b/provisioning/base/general/etc/supervisor.d/postfix.conf similarity index 100% rename from provisioning/base-app/general/etc/supervisor.d/postfix.conf rename to provisioning/base/general/etc/supervisor.d/postfix.conf diff --git a/provisioning/base-app/general/etc/supervisor.d/ssh.conf b/provisioning/base/general/etc/supervisor.d/ssh.conf similarity index 100% rename from provisioning/base-app/general/etc/supervisor.d/ssh.conf rename to provisioning/base/general/etc/supervisor.d/ssh.conf diff --git a/provisioning/base/general/provision/service.d/.gitkeep b/provisioning/base/general/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/provisioning/base/general/provision/service.d/cron.sh b/provisioning/base/general/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/provisioning/base/general/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/provisioning/base/general/provision/service.d/dnsmasq.sh b/provisioning/base/general/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/provisioning/base/general/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/provisioning/base/general/provision/service.d/postfix.sh b/provisioning/base/general/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/provisioning/base/general/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/provisioning/base/general/provision/service.d/ssh.sh b/provisioning/base/general/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/provisioning/base/general/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 21ac56777..54ddbd31a 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -23,7 +23,6 @@ RUN chmod +x /opt/docker/bin/* \ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ python \ - cronie \ supervisor \ syslog-ng \ wget \ @@ -44,7 +43,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ @@ -63,7 +61,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index 6eedc43d1..b39e7db41 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -4,12 +4,6 @@ {% macro alpine(role='') -%} RUN /usr/local/bin/apk-install-edge shadow \ && /usr/local/bin/apk-install \ - # Install services - openssh \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ @@ -33,11 +27,6 @@ RUN /usr/local/bin/apk-install-edge shadow \ {% macro centos(role='') -%} # Install services RUN /usr/local/bin/yum-install \ - openssh-server \ - mysql \ - sqlite \ - dnsmasq \ - postfix \ # Install tools sudo \ zip \ @@ -63,12 +52,6 @@ RUN /usr/local/bin/yum-install \ {% macro debian(role='') -%} # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ @@ -92,12 +75,6 @@ RUN /usr/local/bin/apt-install \ {% macro debian9(role='') -%} # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mariadb-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ @@ -121,12 +98,6 @@ RUN /usr/local/bin/apt-install \ {% macro ubuntu(role='') -%} # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index 2f8f0bf89..aafb72a84 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -1,5 +1,7 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/services.jinja2' as services %} + {% macro alpine(role='') -%} # Install development environment @@ -8,6 +10,7 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -23,6 +26,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -36,6 +40,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -51,6 +56,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -67,6 +73,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 7dad0c04b..a68f247a6 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -1,5 +1,6 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/services.jinja2' as services %} {% macro alpine(role='') -%} # Install php environment @@ -58,6 +59,7 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -105,6 +107,7 @@ RUN /usr/local/bin/yum-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -147,6 +150,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Cleanup && yum erase -y php-devel gcc \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -182,6 +186,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -220,6 +225,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -257,6 +263,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -293,6 +300,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -331,6 +339,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -362,6 +371,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 index 4be519031..a2fb003b3 100644 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ b/template/Dockerfile/images/php7-dev.jinja2 @@ -1,5 +1,6 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/services.jinja2' as services %} {% macro alpine(role='') -%} # Install development environment @@ -8,6 +9,7 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php7-xdebug \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -23,6 +25,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php7-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -36,6 +39,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php70w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -51,6 +55,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -66,6 +71,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php7.0-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -81,6 +87,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ # php7.0-xdebug \ # Is currently not available blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -96,6 +103,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php-xdebug \ blackfire-php \ blackfire-agent \ + {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 index ec3f29198..744ecd431 100644 --- a/template/Dockerfile/images/php7.jinja2 +++ b/template/Dockerfile/images/php7.jinja2 @@ -1,5 +1,6 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/services.jinja2' as services %} {% macro alpine(role='') -%} # Install php environment @@ -63,6 +64,7 @@ RUN /usr/local/bin/apk-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -96,6 +98,7 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou php7.0-memcached \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -142,6 +145,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-mbstring \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -177,6 +181,7 @@ RUN /usr/local/bin/apt-install \ php-memcache \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -211,6 +216,7 @@ RUN /usr/local/bin/apt-install \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -260,6 +266,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && rm -rf /tmp/* \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ + {{ services.php() }} \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2 index 5c63a31f1..c446f6a64 100644 --- a/template/Dockerfile/layout.jinja2 +++ b/template/Dockerfile/layout.jinja2 @@ -1,6 +1,7 @@ {% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} {% import 'Dockerfile/environment.jinja2' as environment %} +{% import 'Dockerfile/services.jinja2' as services %} {% import 'Dockerfile/images/ansible.jinja2' as ansible %} {% import 'Dockerfile/images/bootstrap.jinja2' as bootstrap %} diff --git a/template/Dockerfile/services.jinja2 b/template/Dockerfile/services.jinja2 new file mode 100644 index 000000000..9f5c9e5bd --- /dev/null +++ b/template/Dockerfile/services.jinja2 @@ -0,0 +1,11 @@ +{% macro php() -%} + # Enable php services + && /opt/docker/bin/control.sh service.enable cron +{%- endmacro %} + +{% macro phpDev() -%} + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix +{%- endmacro %} + From 77c9921255c1a77b4fc2f2d959d1dd1f98bc0bf9 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 7 Apr 2017 01:23:20 +0200 Subject: [PATCH 18/58] Adapt last changes for develop changes --- docker/php-official/5.6/Dockerfile | 7 --- docker/php-official/5.6/conf/bin/config.sh | 5 ++ docker/php-official/5.6/conf/bin/control.sh | 28 +++++++++-- .../5.6/conf/bin/service.d/ssh.d/10-init.sh | 5 ++ .../5.6/conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- .../5.6/conf/provision/service.d/.gitkeep | 0 .../5.6/conf/provision/service.d/cron.sh | 11 +++++ .../5.6/conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../5.6/conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../5.6/conf/provision/service.d/ssh.sh | 15 ++++++ docker/php-official/7.0/Dockerfile | 7 --- docker/php-official/7.0/conf/bin/config.sh | 5 ++ docker/php-official/7.0/conf/bin/control.sh | 28 +++++++++-- .../7.0/conf/bin/service.d/ssh.d/10-init.sh | 5 ++ .../7.0/conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- .../7.0/conf/provision/service.d/.gitkeep | 0 .../7.0/conf/provision/service.d/cron.sh | 11 +++++ .../7.0/conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../7.0/conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../7.0/conf/provision/service.d/ssh.sh | 15 ++++++ docker/php-official/7.1/Dockerfile | 7 --- docker/php-official/7.1/conf/bin/config.sh | 5 ++ docker/php-official/7.1/conf/bin/control.sh | 28 +++++++++-- .../7.1/conf/bin/service.d/ssh.d/10-init.sh | 5 ++ .../7.1/conf/etc/supervisor.d/dnsmasq.conf | 2 +- .../webdevops-base-app/tasks/bootstrap.yml | 3 -- .../tasks/bootstrap/dnsmasq.yml | 10 ---- .../tasks/bootstrap/postfix.yml | 29 ----------- .../tasks/bootstrap/ssh.yml | 12 ----- .../tasks/bootstrap/user.yml | 6 --- .../7.1/conf/provision/service.d/.gitkeep | 0 .../7.1/conf/provision/service.d/cron.sh | 11 +++++ .../7.1/conf/provision/service.d/dnsmasq.sh | 29 +++++++++++ .../7.1/conf/provision/service.d/postfix.sh | 49 +++++++++++++++++++ .../7.1/conf/provision/service.d/ssh.sh | 15 ++++++ 45 files changed, 417 insertions(+), 216 deletions(-) delete mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/5.6/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/5.6/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/5.6/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/5.6/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/7.0/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/7.0/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/7.0/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/7.0/conf/provision/service.d/ssh.sh delete mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml delete mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml delete mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml create mode 100644 docker/php-official/7.1/conf/provision/service.d/.gitkeep create mode 100644 docker/php-official/7.1/conf/provision/service.d/cron.sh create mode 100644 docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh create mode 100644 docker/php-official/7.1/conf/provision/service.d/postfix.sh create mode 100644 docker/php-official/7.1/conf/provision/service.d/ssh.sh diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 0a229407c..fb8dd2f13 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -92,7 +92,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ @@ -104,12 +103,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/php-official/5.6/conf/bin/config.sh b/docker/php-official/5.6/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/php-official/5.6/conf/bin/config.sh +++ b/docker/php-official/5.6/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/php-official/5.6/conf/bin/control.sh b/docker/php-official/5.6/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/php-official/5.6/conf/bin/control.sh +++ b/docker/php-official/5.6/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh index e3192fe01..f2b600312 100644 --- a/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/php-official/5.6/conf/bin/service.d/ssh.d/10-init.sh @@ -1,2 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + # generate host keys ssh-keygen -A diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/php-official/5.6/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/php-official/5.6/conf/provision/service.d/.gitkeep b/docker/php-official/5.6/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/5.6/conf/provision/service.d/cron.sh b/docker/php-official/5.6/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/php-official/5.6/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/php-official/5.6/conf/provision/service.d/postfix.sh b/docker/php-official/5.6/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/php-official/5.6/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/php-official/5.6/conf/provision/service.d/ssh.sh b/docker/php-official/5.6/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 68abdbb21..1cb592d05 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -92,7 +92,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ @@ -104,12 +103,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/php-official/7.0/conf/bin/config.sh b/docker/php-official/7.0/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/php-official/7.0/conf/bin/config.sh +++ b/docker/php-official/7.0/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/php-official/7.0/conf/bin/control.sh b/docker/php-official/7.0/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/php-official/7.0/conf/bin/control.sh +++ b/docker/php-official/7.0/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh index e3192fe01..f2b600312 100644 --- a/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/php-official/7.0/conf/bin/service.d/ssh.d/10-init.sh @@ -1,2 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + # generate host keys ssh-keygen -A diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/php-official/7.0/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/php-official/7.0/conf/provision/service.d/.gitkeep b/docker/php-official/7.0/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.0/conf/provision/service.d/cron.sh b/docker/php-official/7.0/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/php-official/7.0/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/php-official/7.0/conf/provision/service.d/postfix.sh b/docker/php-official/7.0/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/php-official/7.0/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/php-official/7.0/conf/provision/service.d/ssh.sh b/docker/php-official/7.0/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index b52c124f3..18cc967d2 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -92,7 +92,6 @@ RUN chmod +x /opt/docker/bin/* \ supervisor \ syslog-ng \ syslog-ng-core \ - cron \ wget \ curl \ net-tools \ @@ -104,12 +103,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN /usr/local/bin/apt-install \ - # Install services - openssh-server \ - mysql-client \ - sqlite \ - dnsmasq \ - postfix \ # Install common tools sudo \ zip \ diff --git a/docker/php-official/7.1/conf/bin/config.sh b/docker/php-official/7.1/conf/bin/config.sh index 3155728e8..8a399464a 100644 --- a/docker/php-official/7.1/conf/bin/config.sh +++ b/docker/php-official/7.1/conf/bin/config.sh @@ -2,6 +2,11 @@ shopt -s nullglob +IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) +IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) +IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) + ### # Check if current user is root # diff --git a/docker/php-official/7.1/conf/bin/control.sh b/docker/php-official/7.1/conf/bin/control.sh index a6697092d..c93c963f9 100644 --- a/docker/php-official/7.1/conf/bin/control.sh +++ b/docker/php-official/7.1/conf/bin/control.sh @@ -102,8 +102,24 @@ case "$CONTROL_COMMAND" in "service.enable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = true' -- "$SERVICE_FILE" + PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" + + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for $1, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = true' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 @@ -112,8 +128,12 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [ -f "$SERVICE_FILE" ]; then - sed -i '/autostart = /c\autostart = false' -- "$SERVICE_FILE" + if [[ -f "$SERVICE_FILE" ]]; then + go-replace \ + -s 'autostart =' \ + -r 'autostart = false' \ + --replace-line \ + -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" exit 1 diff --git a/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh index e3192fe01..f2b600312 100644 --- a/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh +++ b/docker/php-official/7.1/conf/bin/service.d/ssh.d/10-init.sh @@ -1,2 +1,7 @@ +# Init ssh privilege separation directory +mkdir -p /var/run/sshd +chown root:root /var/run/sshd +chmod 755 /var/run/sshd + # generate host keys ssh-keygen -A diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf index a0ad2de88..9832ffca7 100644 --- a/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf +++ b/docker/php-official/7.1/conf/etc/supervisor.d/dnsmasq.conf @@ -6,7 +6,7 @@ priority=15 command = /opt/docker/bin/service.d/dnsmasq.sh process_name=%(program_name)s startsecs = 0 -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml index ea9e54682..3fdce9a74 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml @@ -2,6 +2,3 @@ - include: bootstrap/user.yml - include: bootstrap/application.yml -- include: bootstrap/dnsmasq.yml -- include: bootstrap/postfix.yml -- include: bootstrap/ssh.yml diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml deleted file mode 100644 index 962a7953a..000000000 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/dnsmasq.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Configure dnsmasq - lineinfile: - dest: /etc/dnsmasq.conf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'user', value: 'root' } - - { key: 'conf-dir', value: '/etc/dnsmasq.d' } diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml deleted file mode 100644 index f05ff660c..000000000 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/postfix.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Link aliases file to postfix aliases - file: - src: '/etc/postfix/aliases' - dest: '/etc/aliases' - state: link - force: yes - when: ansible_os_family == 'Alpine' - -- name: Configure postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}={{ item.value }}' - with_items: - - { key: 'mydestination', value: '' } - - { key: 'message_size_limit', value: '15240000' } - # Hardening - - { key: 'smtp_use_tls', value: 'yes' } - - { key: 'smtp_tls_security_level', value: 'may' } - -- name: Remove dynamic configuration for postfix - lineinfile: - dest: /etc/postfix/main.cf - regexp: '^[\s]*{{ item }}[\s]*=' - state: absent - with_items: - - 'myhostname' diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml deleted file mode 100644 index a69c72633..000000000 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/ssh.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Init ssh privilege separation directory - file: - path: "/var/run/sshd" - state: directory - mode: 0755 - owner: "root" - group: "root" - recurse: yes - - diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml index cf6968a01..fd58b329f 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml @@ -1,11 +1,5 @@ --- -- name: Move dnsmasq group (Alpine family) - group: - name: dnsmasq - gid: 153 - when: ansible_distribution == 'Alpine' - - name: Create application group group: name: "{{ APPLICATION_GROUP }}" diff --git a/docker/php-official/7.1/conf/provision/service.d/.gitkeep b/docker/php-official/7.1/conf/provision/service.d/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/docker/php-official/7.1/conf/provision/service.d/cron.sh b/docker/php-official/7.1/conf/provision/service.d/cron.sh new file mode 100644 index 000000000..84854094b --- /dev/null +++ b/docker/php-official/7.1/conf/provision/service.d/cron.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install cron + ;; + + RedHat) + yum-install cronie + ;; +esac diff --git a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh new file mode 100644 index 000000000..76e94393e --- /dev/null +++ b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install dnsmasq + ;; + + RedHat) + yum-install dnsmasq + ;; + + Alpine) + apk-install dnsmasq + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*user[\s]*=' \ + -r 'user = root' \ + --replace-line + /etc/dnsmasq.conf + +go-replace \ + -s '^[\s]*conf-dir[\s]*=' \ + -r 'conf-dir = /etc/dnsmasq.d' \ + --replace-line + /etc/dnsmasq.conf diff --git a/docker/php-official/7.1/conf/provision/service.d/postfix.sh b/docker/php-official/7.1/conf/provision/service.d/postfix.sh new file mode 100644 index 000000000..87d12ebad --- /dev/null +++ b/docker/php-official/7.1/conf/provision/service.d/postfix.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install postfix + ;; + + RedHat) + yum-install postfix + ;; + + Alpine) + apk-install postfix + ln -s -f /etc/postfix/aliases /etc/aliases + ;; +esac + +# Configuration +go-replace \ + -s '^[\s]*mydestination[\s]*=' \ + -r 'mydestination = ' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*message_size_limit[\s]*=' \ + -r 'message_size_limit = 15240000' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_use_tls[\s]*=' \ + -r 'smtp_use_tls = yes' \ + --replace-line \ + /etc/postfix/main.cf + +go-replace \ + -s '^[\s]*smtp_tls_security_level[\s]*=' \ + -r 'smtp_tls_security_level = may' \ + --replace-line \ + /etc/postfix/main.cf + +# Remove hostname +go-replace \ + -s '^[\s]*myhostname[\s]*=' \ + -r '# myhostname' \ + --replace-line \ + /etc/postfix/main.cf diff --git a/docker/php-official/7.1/conf/provision/service.d/ssh.sh b/docker/php-official/7.1/conf/provision/service.d/ssh.sh new file mode 100644 index 000000000..550e81f79 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/service.d/ssh.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install openssh-server + ;; + + RedHat) + yum-install openssh-server + ;; + + Alpine) + apk-install openssh + ;; +esac From 544419b919f9ad62e56d0f7f4a10853f4f6e0a23 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 00:51:57 +0200 Subject: [PATCH 19/58] Add missing php-dev official images --- docker/php-dev/5.6/Dockerfile | 30 ++++++ docker/php-dev/5.6/Dockerfile.jinja2 | 7 ++ .../service.d/blackfire-agent.d/10-init.sh | 1 + .../5.6/conf/bin/service.d/blackfire-agent.sh | 23 +++++ .../etc/supervisor.d/blackfire-agent.conf | 14 +++ .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++++++++++++++++ .../roles/webdevops-dev/defaults/main.yml | 7 ++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 ++++ .../roles/webdevops-dev/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 ++ .../webdevops-php-dev/tasks/bootstrap.yml | 8 ++ .../tasks/bootstrap/php-fpm.yml | 18 ++++ .../tasks/bootstrap/php-module.blackfire.yml | 10 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 28 ++++++ .../tasks/bootstrap/php-module.yml | 41 ++++++++ .../tasks/bootstrap/tools.yml | 23 +++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + docker/php-dev/7.0/Dockerfile | 30 ++++++ docker/php-dev/7.0/Dockerfile.jinja2 | 7 ++ .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.0/conf/bin/service.d/blackfire-agent.sh | 23 +++++ .../etc/supervisor.d/blackfire-agent.conf | 14 +++ .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++++++++++++++++ .../roles/webdevops-dev/defaults/main.yml | 7 ++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 ++++ .../roles/webdevops-dev/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 ++ .../webdevops-php-dev/tasks/bootstrap.yml | 8 ++ .../tasks/bootstrap/php-fpm.yml | 18 ++++ .../tasks/bootstrap/php-module.blackfire.yml | 10 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 28 ++++++ .../tasks/bootstrap/php-module.yml | 41 ++++++++ .../tasks/bootstrap/tools.yml | 23 +++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + docker/php-dev/7.1/Dockerfile | 30 ++++++ docker/php-dev/7.1/Dockerfile.jinja2 | 7 ++ .../service.d/blackfire-agent.d/10-init.sh | 1 + .../7.1/conf/bin/service.d/blackfire-agent.sh | 23 +++++ .../etc/supervisor.d/blackfire-agent.conf | 14 +++ .../provision/entrypoint.d/10-php-debugger.sh | 95 +++++++++++++++++++ .../roles/webdevops-dev/defaults/main.yml | 7 ++ .../roles/webdevops-dev/tasks/bootstrap.yml | 20 ++++ .../roles/webdevops-dev/tasks/main.yml | 5 + .../roles/webdevops-php-dev/defaults/main.yml | 6 ++ .../webdevops-php-dev/tasks/bootstrap.yml | 8 ++ .../tasks/bootstrap/php-fpm.yml | 18 ++++ .../tasks/bootstrap/php-module.blackfire.yml | 10 ++ .../tasks/bootstrap/php-module.opcache.yml | 14 +++ .../tasks/bootstrap/php-module.xdebug.yml | 28 ++++++ .../tasks/bootstrap/php-module.yml | 41 ++++++++ .../tasks/bootstrap/tools.yml | 23 +++++ .../roles/webdevops-php-dev/tasks/main.yml | 5 + 54 files changed, 1065 insertions(+) create mode 100644 docker/php-dev/5.6/Dockerfile create mode 100644 docker/php-dev/5.6/Dockerfile.jinja2 create mode 100644 docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-dev/7.0/Dockerfile create mode 100644 docker/php-dev/7.0/Dockerfile.jinja2 create mode 100644 docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml create mode 100644 docker/php-dev/7.1/Dockerfile create mode 100644 docker/php-dev/7.1/Dockerfile.jinja2 create mode 100644 docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh create mode 100644 docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh create mode 100644 docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf create mode 100644 docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-dev/defaults/main.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/main.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml create mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile new file mode 100644 index 000000000..e6e0abe8f --- /dev/null +++ b/docker/php-dev/5.6/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:5.6 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:5.6 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +COPY conf/ /opt/docker/ + +# Install development environment +RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ + && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ + && /usr/local/bin/apt-install \ + # Install tools + graphviz \ + # Install php development stuff + php5-xdebug \ + blackfire-php \ + blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 new file mode 100644 index 000000000..95f501235 --- /dev/null +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "5.6") }} + +{{ docker.version() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5dev.debian() }} diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-dev/5.6/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/5.6/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/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-dev/5.6/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/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile new file mode 100644 index 000000000..e76fdaed3 --- /dev/null +++ b/docker/php-dev/7.0/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:7.0 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.0 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +COPY conf/ /opt/docker/ + +# Install development environment +RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ + && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ + && /usr/local/bin/apt-install \ + # Install tools + graphviz \ + # Install php development stuff + php5-xdebug \ + blackfire-php \ + blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 new file mode 100644 index 000000000..a85f1f7c7 --- /dev/null +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "7.0") }} + +{{ docker.version() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5dev.debian() }} diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-dev/7.0/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/7.0/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/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-dev/7.0/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/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile new file mode 100644 index 000000000..e2543f3ab --- /dev/null +++ b/docker/php-dev/7.1/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-dev:7.1 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php:7.1 + +MAINTAINER info@webdevops.io +LABEL vendor=WebDevOps.io +LABEL io.webdevops.layout=8 +LABEL io.webdevops.version=1.5.0 + +COPY conf/ /opt/docker/ + +# Install development environment +RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ + && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ + && /usr/local/bin/apt-install \ + # Install tools + graphviz \ + # Install php development stuff + php5-xdebug \ + blackfire-php \ + blackfire-agent \ + # Enable php development services + && /opt/docker/bin/control.sh service.enable ssh \ + && /opt/docker/bin/control.sh service.enable postfix \ + && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ + && /opt/docker/bin/bootstrap.sh \ + && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 new file mode 100644 index 000000000..d594a2db6 --- /dev/null +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "7.1") }} + +{{ docker.version() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ php5dev.debian() }} diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh new file mode 100644 index 000000000..fdffa2a0f --- /dev/null +++ b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh @@ -0,0 +1 @@ +# placeholder diff --git a/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh new file mode 100644 index 000000000..fbec23cf3 --- /dev/null +++ b/docker/php-dev/7.1/conf/bin/service.d/blackfire-agent.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +set -e + +source /opt/docker/bin/config.sh + +BLACKFIRE_ARGS="" + +includeScriptDir "/opt/docker/bin/service.d/syslog-ng.d/" + +# blackfire.server_id +if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-id=\"${BLACKFIRE_SERVER_ID}\"" +fi + +# blackfire.server_token +if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then + BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\"" +fi + +# create directory for unix socket +mkdir -p /var/run/blackfire + +eval exec blackfire-agent $BLACKFIRE_ARGS diff --git a/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf new file mode 100644 index 000000000..897831ddb --- /dev/null +++ b/docker/php-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf @@ -0,0 +1,14 @@ +[group:blackfire-agent] +programs=blackfire-agentd +priority=25 + +[program:blackfire-agentd] +command = /opt/docker/bin/service.d/blackfire-agent.sh +process_name=%(program_name)s +startsecs = 0 +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh new file mode 100644 index 000000000..7156e28aa --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -0,0 +1,95 @@ +#!/usr/bin/env bash + +################################################# +# Debugger switch +################################################# + +PHP_CONF_PATHS=" +/etc/php5/conf.d +/etc/php7/conf.d +/etc/php.d +/etc/php5/mods-available +/etc/php5/cli/conf.d +/etc/php5/cli/conf.d +/etc/php5/fpm/conf.d +/etc/php5/fpm/conf.d +/etc/php/7.0/mods-available +/etc/php/7.0/cli/conf.d +/etc/php/7.0/fpm/conf.d" + +function phpModuleRemove() { + if [ "$#" -ne 1 ]; then + echo "You must specify the name of the PHP module which you want to disable" + exit 1 + fi + + echo " - Removing PHP module ${1}" + for CONF_PATH in $PHP_CONF_PATHS; do + rm -f "${CONF_PATH}"/*"${1}".ini + done +} + + +if [[ -n "${PHP_DEBUGGER+x}" ]]; then + case "$PHP_DEBUGGER" in + xdebug) + echo "PHP-Debugger: Xdebug enabled" + phpModuleRemove "blackfire" + ;; + + blackfire) + echo "PHP-Debugger: Blackfire enabled" + phpModuleRemove "xdebug" + /opt/docker/bin/control.sh service.enable blackfire-agent + ;; + + none) + echo "PHP-Debugger: none" + phpModuleRemove "blackfire" + phpModuleRemove "xdebug" + ;; + esac + +else + + echo "PHP-Debugger: not specified - default is xdebug" + phpModuleRemove "blackfire" + +fi + +################################################# +# PHP debugger environment variables +################################################# + +function phpEnvironmentVariable() { + PHP_INI_KEY="$1" + PHP_ENV_NAME="$2" + + if [[ -n "${!PHP_ENV_NAME+x}" ]]; then + PHP_ENV_VALUE="${!PHP_ENV_NAME}" + echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini + fi +} + +################### +# XDEBUG +################### + +# remote debugger +phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK" +phpEnvironmentVariable "xdebug.remote_autostart" "XDEBUG_REMOTE_AUTOSTART" +phpEnvironmentVariable "xdebug.remote_host" "XDEBUG_REMOTE_HOST" +phpEnvironmentVariable "xdebug.remote_port" "XDEBUG_REMOTE_PORT" + +# profiler +phpEnvironmentVariable "xdebug.profiler_enable" "XDEBUG_PROFILER_ENABLE" +phpEnvironmentVariable "xdebug.profiler_enable_trigger" "XDEBUG_PROFILER_ENABLE_TRIGGER" +phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" +phpEnvironmentVariable "xdebug.profiler_output_dir" "XDEBUG_PROFILER_OUTPUT_DIR" +phpEnvironmentVariable "xdebug.profiler_output_name" "XDEBUG_PROFILER_OUTPUT_NAME" + +################### +# BLACKFIRE +################### +phpEnvironmentVariable "blackfire.server_id" "BLACKFIRE_SERVER_ID" +phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN" diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/defaults/main.yml new file mode 100644 index 000000000..4406ea8b4 --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +APPLICATION_USER: "{{ lookup('env','APPLICATION_USER') }}" +APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}" +APPLICATION_UID: "{{ lookup('env','APPLICATION_UID') }}" +APPLICATION_GID: "{{ lookup('env','APPLICATION_GID') }}" +APPLICATION_PASSWORD: "dev" diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..5c9eafbd0 --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -0,0 +1,20 @@ +--- + +- name: Enable ssh daemon + shell: "/opt/docker/bin/control.sh service.enable ssh" + +- name: Set application user password + user: + name: "{{ APPLICATION_USER }}" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Set root password + user: + name: "root" + password: "{{ APPLICATION_PASSWORD | password_hash('sha256') }}" + +- name: Enable ssh root access + lineinfile: + dest: /etc/ssh/sshd_config + regexp: '^PermitRootLogin' + line: 'PermitRootLogin yes' diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/defaults/main.yml new file mode 100644 index 000000000..81f5b7efd --- /dev/null +++ b/docker/php-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml new file mode 100644 index 000000000..2c5d76e3d --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -0,0 +1,8 @@ +--- + +- 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml new file mode 100644 index 000000000..9455a78e2 --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml @@ -0,0 +1,18 @@ +--- + +- name: Configure php-fpm pool user (application.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.log', value: "/docker.stdout" } + - { 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml new file mode 100644 index 000000000..dce03a1cc --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,10 @@ +--- + +- name: Remove superfluous blackfire configuration file + file: + path: '{{ item }}' + state: absent + with_items: + - /etc/php5/cli/conf.d/zz-blackfire.ini + - /etc/php5/fpm/conf.d/zz-blackfire.ini + when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/7.1/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/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml new file mode 100644 index 000000000..7f20c845e --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml @@ -0,0 +1,28 @@ +--- + +# Ignored on php7 +- name: Fix php xdebug module [Alpine family] + lineinfile: + dest: '{{ item }}' + regexp: 'extension=xdebug.so' + line: 'zend_extension=xdebug.so' + when: ansible_distribution == 'Alpine' + with_items: + - /etc/php5/conf.d/xdebug.ini + - /etc/php7/conf.d/xdebug.ini + 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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml new file mode 100644 index 000000000..31cccd1ae --- /dev/null +++ b/docker/php-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml new file mode 100644 index 000000000..c49cb0e34 --- /dev/null +++ b/docker/php-dev/7.1/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/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml new file mode 100644 index 000000000..1806c1a8c --- /dev/null +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/main.yml @@ -0,0 +1,5 @@ +--- + +- include: bootstrap.yml + tags: + - bootstrap From 056055b491b40f8e82364c9ff25ccab4d605c0c9 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 00:52:14 +0200 Subject: [PATCH 20/58] Fix issues with new layout --- docker/base-app/alpine-3/Dockerfile | 2 + docker/base-app/centos-7/Dockerfile | 2 + docker/base-app/debian-7/Dockerfile | 2 + docker/base-app/debian-8/Dockerfile | 2 + docker/base-app/debian-9/Dockerfile | 2 + docker/base-app/ubuntu-12.04/Dockerfile | 2 + docker/base-app/ubuntu-14.04/Dockerfile | 2 + docker/base-app/ubuntu-15.04/Dockerfile | 2 + docker/base-app/ubuntu-15.10/Dockerfile | 2 + docker/base-app/ubuntu-16.04/Dockerfile | 2 + docker/base-app/ubuntu-16.10/Dockerfile | 2 + docker/base/alpine-3/Dockerfile | 2 - docker/base/alpine-3/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/centos-7/Dockerfile | 2 - docker/base/centos-7/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/debian-7/Dockerfile | 2 - docker/base/debian-7/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/debian-8/Dockerfile | 2 - docker/base/debian-8/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/debian-9/Dockerfile | 2 - docker/base/debian-9/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-12.04/Dockerfile | 2 - docker/base/ubuntu-12.04/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-14.04/Dockerfile | 2 - docker/base/ubuntu-14.04/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-15.04/Dockerfile | 2 - docker/base/ubuntu-15.04/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-15.10/Dockerfile | 2 - docker/base/ubuntu-15.10/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-16.04/Dockerfile | 2 - docker/base/ubuntu-16.04/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/base/ubuntu-16.10/Dockerfile | 2 - docker/base/ubuntu-16.10/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/php-official/5.6/Dockerfile | 2 + docker/php-official/5.6/conf/bin/control.sh | 12 ++---- .../5.6/conf/provision/service.d/dnsmasq.sh | 15 ++------ .../5.6/conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/php-official/7.0/Dockerfile | 2 + docker/php-official/7.0/conf/bin/control.sh | 12 ++---- .../7.0/conf/provision/service.d/dnsmasq.sh | 15 ++------ .../7.0/conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/php-official/7.1/Dockerfile | 2 + docker/php-official/7.1/conf/bin/control.sh | 12 ++---- .../7.1/conf/provision/service.d/dnsmasq.sh | 15 ++------ .../7.1/conf/provision/service.d/postfix.sh | 37 ++++--------------- docker/samson-deployment/latest/Dockerfile | 4 +- .../latest/conf/bin/control.sh | 12 ++---- .../conf/provision/service.d/dnsmasq.sh | 15 ++------ .../conf/provision/service.d/postfix.sh | 37 ++++--------------- provisioning/base/general/bin/control.sh | 12 ++---- .../general/provision/service.d/dnsmasq.sh | 15 ++------ .../general/provision/service.d/postfix.sh | 37 ++++--------------- template/Dockerfile/environment.jinja2 | 4 +- 75 files changed, 272 insertions(+), 810 deletions(-) diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 3b81601b3..205451f84 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 5d0fe021e..7e962dfdf 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 3a8eb03bd..0548e6684 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 5af3ae09d..acd8674db 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index b15da2f43..9803421bd 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 24aa1001b..9836516fd 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 521a01cb7..07c020ce7 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 629c5839a..32c0a362f 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 950172ad9..b914f6e17 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index a883e7b6f..b8eb99af0 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index ea94fb95e..84f127ec8 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -15,6 +15,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 17747d8ec..7d0c12ba3 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/alpine-3/conf/bin/control.sh b/docker/base/alpine-3/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/alpine-3/conf/bin/control.sh +++ b/docker/base/alpine-3/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/alpine-3/conf/provision/service.d/postfix.sh b/docker/base/alpine-3/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/alpine-3/conf/provision/service.d/postfix.sh +++ b/docker/base/alpine-3/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index fbe86fdcd..4783f9988 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/centos-7/conf/bin/control.sh b/docker/base/centos-7/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/centos-7/conf/bin/control.sh +++ b/docker/base/centos-7/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/centos-7/conf/provision/service.d/postfix.sh b/docker/base/centos-7/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/centos-7/conf/provision/service.d/postfix.sh +++ b/docker/base/centos-7/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 272b46278..39dbb5610 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/base/debian-7/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/debian-7/conf/bin/control.sh +++ b/docker/base/debian-7/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/debian-7/conf/provision/service.d/postfix.sh b/docker/base/debian-7/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/debian-7/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-7/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 10d6ea12d..a6d028868 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/base/debian-8/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/debian-8/conf/bin/control.sh +++ b/docker/base/debian-8/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/debian-8/conf/provision/service.d/postfix.sh b/docker/base/debian-8/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/debian-8/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-8/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 00c83040d..411def876 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/base/debian-9/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/debian-9/conf/bin/control.sh +++ b/docker/base/debian-9/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/debian-9/conf/provision/service.d/postfix.sh b/docker/base/debian-9/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/debian-9/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-9/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 6099bbf1b..c7ccc5a9d 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/base/ubuntu-12.04/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-12.04/conf/bin/control.sh +++ b/docker/base/ubuntu-12.04/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 4328a154d..6327a2a87 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/base/ubuntu-14.04/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-14.04/conf/bin/control.sh +++ b/docker/base/ubuntu-14.04/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 3718f10a8..9ff8e6e5d 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.04/conf/bin/control.sh b/docker/base/ubuntu-15.04/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-15.04/conf/bin/control.sh +++ b/docker/base/ubuntu-15.04/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 97bdca1b7..a41653152 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.10/conf/bin/control.sh b/docker/base/ubuntu-15.10/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-15.10/conf/bin/control.sh +++ b/docker/base/ubuntu-15.10/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index d1aabea4d..a61174542 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.04/conf/bin/control.sh b/docker/base/ubuntu-16.04/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-16.04/conf/bin/control.sh +++ b/docker/base/ubuntu-16.04/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 3f591b732..0cd95010e 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -11,8 +11,6 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.10/conf/bin/control.sh b/docker/base/ubuntu-16.10/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/base/ubuntu-16.10/conf/bin/control.sh +++ b/docker/base/ubuntu-16.10/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index fb8dd2f13..15ae81dcd 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -18,6 +18,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ADD baselayout.tar / diff --git a/docker/php-official/5.6/conf/bin/control.sh b/docker/php-official/5.6/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/php-official/5.6/conf/bin/control.sh +++ b/docker/php-official/5.6/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/5.6/conf/provision/service.d/postfix.sh b/docker/php-official/5.6/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/php-official/5.6/conf/provision/service.d/postfix.sh +++ b/docker/php-official/5.6/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 1cb592d05..fe9d08cbc 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -18,6 +18,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ADD baselayout.tar / diff --git a/docker/php-official/7.0/conf/bin/control.sh b/docker/php-official/7.0/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/php-official/7.0/conf/bin/control.sh +++ b/docker/php-official/7.0/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.0/conf/provision/service.d/postfix.sh b/docker/php-official/7.0/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/php-official/7.0/conf/provision/service.d/postfix.sh +++ b/docker/php-official/7.0/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 18cc967d2..bb03421bc 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -18,6 +18,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ADD baselayout.tar / diff --git a/docker/php-official/7.1/conf/bin/control.sh b/docker/php-official/7.1/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/php-official/7.1/conf/bin/control.sh +++ b/docker/php-official/7.1/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/php-official/7.1/conf/provision/service.d/postfix.sh b/docker/php-official/7.1/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/php-official/7.1/conf/provision/service.d/postfix.sh +++ b/docker/php-official/7.1/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 4798a6e73..c78fd4c4e 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -64,8 +64,6 @@ RUN set -x \ ############################################################################### ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ @@ -118,6 +116,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/samson-deployment/latest/conf/bin/control.sh b/docker/samson-deployment/latest/conf/bin/control.sh index c93c963f9..97113b659 100644 --- a/docker/samson-deployment/latest/conf/bin/control.sh +++ b/docker/samson-deployment/latest/conf/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/provisioning/base/general/bin/control.sh b/provisioning/base/general/bin/control.sh index c93c963f9..97113b659 100644 --- a/provisioning/base/general/bin/control.sh +++ b/provisioning/base/general/bin/control.sh @@ -115,10 +115,8 @@ case "$CONTROL_COMMAND" in fi if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = true' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = true' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" @@ -129,10 +127,8 @@ case "$CONTROL_COMMAND" in "service.disable") SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" if [[ -f "$SERVICE_FILE" ]]; then - go-replace \ - -s 'autostart =' \ - -r 'autostart = false' \ - --replace-line \ + go-replace --mode=line \ + -s 'autostart =' -r 'autostart = false' \ -- "$SERVICE_FILE" else echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" diff --git a/provisioning/base/general/provision/service.d/dnsmasq.sh b/provisioning/base/general/provision/service.d/dnsmasq.sh index 76e94393e..d87637948 100644 --- a/provisioning/base/general/provision/service.d/dnsmasq.sh +++ b/provisioning/base/general/provision/service.d/dnsmasq.sh @@ -16,14 +16,7 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*user[\s]*=' \ - -r 'user = root' \ - --replace-line - /etc/dnsmasq.conf - -go-replace \ - -s '^[\s]*conf-dir[\s]*=' \ - -r 'conf-dir = /etc/dnsmasq.d' \ - --replace-line - /etc/dnsmasq.conf +go-replace --mode=line \ + -s '^[\s]*user[\s]*=' -r 'user = root' \ + -s '^[\s]*conf-dir[\s]*=' -r 'conf-dir = /etc/dnsmasq.d' \ + -- /etc/dnsmasq.conf diff --git a/provisioning/base/general/provision/service.d/postfix.sh b/provisioning/base/general/provision/service.d/postfix.sh index 87d12ebad..e3323c388 100644 --- a/provisioning/base/general/provision/service.d/postfix.sh +++ b/provisioning/base/general/provision/service.d/postfix.sh @@ -17,33 +17,10 @@ case "$IMAGE_FAMILY" in esac # Configuration -go-replace \ - -s '^[\s]*mydestination[\s]*=' \ - -r 'mydestination = ' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*message_size_limit[\s]*=' \ - -r 'message_size_limit = 15240000' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_use_tls[\s]*=' \ - -r 'smtp_use_tls = yes' \ - --replace-line \ - /etc/postfix/main.cf - -go-replace \ - -s '^[\s]*smtp_tls_security_level[\s]*=' \ - -r 'smtp_tls_security_level = may' \ - --replace-line \ - /etc/postfix/main.cf - -# Remove hostname -go-replace \ - -s '^[\s]*myhostname[\s]*=' \ - -r '# myhostname' \ - --replace-line \ - /etc/postfix/main.cf +go-replace --mode=line \ + -s '^[\s]*mydestination[\s]*=' -r 'mydestination = ' \ + -s '^[\s]*message_size_limit[\s]*=' -r 'message_size_limit = 15240000' \ + -s '^[\s]*smtp_use_tls[\s]*=' -r 'smtp_use_tls = yes' \ + -s '^[\s]*smtp_tls_security_level[\s]*=' -r 'smtp_tls_security_level = may' \ + -s '^[\s]*myhostname[\s]*=' -r '# myhostname' \ + -- /etc/postfix/main.cf diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index 8ee18dbff..e24b4abcb 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -6,8 +6,6 @@ ENV LC_ALL "{{ charset }}" {% macro homePath() -%} ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" {%- endmacro %} {% macro mailbox() -%} @@ -43,6 +41,8 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 +ENV LOG_STDOUT "" +ENV LOG_STDERR "" {%- endmacro %} {% macro liquibase(version, driver, classpath) -%} From 0a41855b1e8dd81cfd47675b2d3304032a8a8e37 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 01:54:35 +0200 Subject: [PATCH 21/58] Fix php tests --- tests/serverspec/spec/shared/php/cli.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/serverspec/spec/shared/php/cli.rb b/tests/serverspec/spec/shared/php/cli.rb index 5f119ea61..e4271a286 100644 --- a/tests/serverspec/spec/shared/php/cli.rb +++ b/tests/serverspec/spec/shared/php/cli.rb @@ -1,9 +1,9 @@ shared_examples 'php::cli' do it "should include php cli" do - expect(file("/usr/bin/php")).to be_executable + expect(file("php")).to be_executable end - describe command('/usr/bin/php -i') do + describe command('php -i') do its(:exit_status) { should eq 0 } end end From d2d2fa8cfce942675fad05f7ad7bb94ca28e9858 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 01:54:58 +0200 Subject: [PATCH 22/58] Fix environment settings - Introduce environment.base and environment.baseApp --- docker/base-app/alpine-3/Dockerfile | 2 -- docker/base-app/alpine-3/Dockerfile.jinja2 | 2 +- docker/base-app/centos-7/Dockerfile | 2 -- docker/base-app/centos-7/Dockerfile.jinja2 | 2 +- docker/base-app/debian-7/Dockerfile | 2 -- docker/base-app/debian-7/Dockerfile.jinja2 | 2 +- docker/base-app/debian-8/Dockerfile | 2 -- docker/base-app/debian-8/Dockerfile.jinja2 | 2 +- docker/base-app/debian-9/Dockerfile | 2 -- docker/base-app/debian-9/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-12.04/Dockerfile | 2 -- docker/base-app/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-14.04/Dockerfile | 2 -- docker/base-app/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-15.04/Dockerfile | 2 -- docker/base-app/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-15.10/Dockerfile | 2 -- docker/base-app/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-16.04/Dockerfile | 2 -- docker/base-app/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/base-app/ubuntu-16.10/Dockerfile | 2 -- docker/base-app/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/base/alpine-3/Dockerfile | 2 ++ docker/base/alpine-3/Dockerfile.jinja2 | 2 +- docker/base/centos-7/Dockerfile | 2 ++ docker/base/centos-7/Dockerfile.jinja2 | 2 +- docker/base/debian-7/Dockerfile | 2 ++ docker/base/debian-7/Dockerfile.jinja2 | 2 +- docker/base/debian-8/Dockerfile | 2 ++ docker/base/debian-8/Dockerfile.jinja2 | 2 +- docker/base/debian-9/Dockerfile | 2 ++ docker/base/debian-9/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-12.04/Dockerfile | 2 ++ docker/base/ubuntu-12.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-14.04/Dockerfile | 2 ++ docker/base/ubuntu-14.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-15.04/Dockerfile | 2 ++ docker/base/ubuntu-15.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-15.10/Dockerfile | 2 ++ docker/base/ubuntu-15.10/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-16.04/Dockerfile | 2 ++ docker/base/ubuntu-16.04/Dockerfile.jinja2 | 2 +- docker/base/ubuntu-16.10/Dockerfile | 2 ++ docker/base/ubuntu-16.10/Dockerfile.jinja2 | 2 +- docker/php-official/5.6/Dockerfile | 5 +++-- docker/php-official/5.6/Dockerfile.jinja2 | 3 ++- docker/php-official/7.0/Dockerfile | 6 ++++-- docker/php-official/7.0/Dockerfile.jinja2 | 4 +++- docker/php-official/7.1/Dockerfile | 5 +++-- docker/php-official/7.1/Dockerfile.jinja2 | 3 ++- docker/samson-deployment/latest/Dockerfile | 4 ++-- .../samson-deployment/latest/Dockerfile.jinja2 | 4 ++-- template/Dockerfile/environment.jinja2 | 16 +++++++++------- 53 files changed, 74 insertions(+), 64 deletions(-) diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 205451f84..3b81601b3 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/alpine-3/Dockerfile.jinja2 b/docker/base-app/alpine-3/Dockerfile.jinja2 index 07b2464e3..c531b3392 100644 --- a/docker/base-app/alpine-3/Dockerfile.jinja2 +++ b/docker/base-app/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 7e962dfdf..5d0fe021e 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index 8dc4762a5..cce7cd82e 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 0548e6684..3a8eb03bd 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index 495bfb1de..96d405881 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index acd8674db..5af3ae09d 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index 913957eab..d91774307 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 9803421bd..b15da2f43 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index 9b225906a..d46543ad4 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 9836516fd..24aa1001b 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index e4e7bd863..dae317e1d 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 07c020ce7..521a01cb7 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index c896ae0c4..ccb5cafd7 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 32c0a362f..629c5839a 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index 0d8bdcf1b..f506d49c2 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index b914f6e17..950172ad9 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index 35ff82770..7755ca662 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index b8eb99af0..a883e7b6f 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index 6aeaa7f4c..078521573 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 84f127ec8..ea94fb95e 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -15,8 +15,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 index b82f21ea3..51fea842d 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.app() }} +{{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 7d0c12ba3..17747d8ec 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/alpine-3/Dockerfile.jinja2 b/docker/base/alpine-3/Dockerfile.jinja2 index 969ab8227..5bf50437f 100644 --- a/docker/base/alpine-3/Dockerfile.jinja2 +++ b/docker/base/alpine-3/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 4783f9988..fbe86fdcd 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index 1034884ad..4ff468c66 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 39dbb5610..272b46278 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index be61e2751..af00be0ab 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index a6d028868..10d6ea12d 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index a25904508..43a50dcd8 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 411def876..00c83040d 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index c25543988..e752d30fe 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index c7ccc5a9d..6099bbf1b 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index 32cd791fd..94dce4340 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 6327a2a87..4328a154d 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index 83ef8a28f..79a8f8070 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 9ff8e6e5d..3718f10a8 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index aa9c4097c..c8da9ed3b 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index a41653152..97bdca1b7 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index a465f3f3f..353795b8e 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index a61174542..d1aabea4d 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index fd5fb7ce9..33b4a8278 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 0cd95010e..3f591b732 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -11,6 +11,8 @@ LABEL io.webdevops.layout=8 LABEL io.webdevops.version=1.5.0 ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index 347f59c3e..758a629bd 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 15ae81dcd..f41eb6955 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -13,13 +13,14 @@ LABEL io.webdevops.version=1.5.0 ENV TERM "xterm" ENV LANG "en_US.UTF-8" ENV LC_ALL "en_US.UTF-8" +ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" ADD baselayout.tar / diff --git a/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 index 0fce26dea..53caa7ef5 100644 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -3,7 +3,8 @@ {{ docker.version() }} {{ environment.general() }} -{{ environment.app() }} +{{ environment.base() }} +{{ environment.baseApp() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index fe9d08cbc..e25db0c20 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -13,13 +13,15 @@ LABEL io.webdevops.version=1.5.0 ENV TERM "xterm" ENV LANG "en_US.UTF-8" ENV LC_ALL "en_US.UTF-8" +ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" + ADD baselayout.tar / diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index 77aebd57e..bc6b3a857 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -3,7 +3,9 @@ {{ docker.version() }} {{ environment.general() }} -{{ environment.app() }} +{{ environment.base() }} +{{ environment.baseApp() }} + {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index bb03421bc..a1b95a080 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -13,13 +13,14 @@ LABEL io.webdevops.version=1.5.0 ENV TERM "xterm" ENV LANG "en_US.UTF-8" ENV LC_ALL "en_US.UTF-8" +ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" ADD baselayout.tar / diff --git a/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 index 56800f890..f74ada439 100644 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -3,7 +3,8 @@ {{ docker.version() }} {{ environment.general() }} -{{ environment.app() }} +{{ environment.base() }} +{{ environment.baseApp() }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index c78fd4c4e..4798a6e73 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -64,6 +64,8 @@ RUN set -x \ ############################################################################### ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" COPY conf/ /opt/docker/ @@ -116,8 +118,6 @@ ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index fce6e0fc0..c9fbb20ce 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -17,7 +17,7 @@ # Base ############################################################################### -{{ environment.homePath() }} +{{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} @@ -29,7 +29,7 @@ # Base-app ############################################################################### -{{ environment.app() }} +{{ environment.baseApp() }} {{ baseapp.debian() }} diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index e24b4abcb..ff1282d2f 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -4,10 +4,6 @@ ENV LANG "{{ charset }}" ENV LC_ALL "{{ charset }}" {%- endmacro %} -{% macro homePath() -%} -ENV DOCKER_CONF_HOME /opt/docker/ -{%- endmacro %} - {% macro mailbox() -%} ENV MAILBOX_USERNAME "dev" ENV MAILBOX_PASSWORD "dev" @@ -35,14 +31,20 @@ ENV FTP_GID 1000 ENV FTP_PATH /data/ftp/ {%- endmacro %} -{% macro app() -%} + +{% macro base() -%} +ENV DOCKER_CONF_HOME /opt/docker/ +ENV LOG_STDOUT "" +ENV LOG_STDERR "" +{%- endmacro %} + +{% macro baseApp() -%} ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 -ENV LOG_STDOUT "" -ENV LOG_STDERR "" + {%- endmacro %} {% macro liquibase(version, driver, classpath) -%} From ded68e0b68f82f1577b3c8eed24eda7da2f286f4 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 21:38:11 +0200 Subject: [PATCH 23/58] Fix php issues --- conf/console.yml | 2 +- docker/php-official/5.6/Dockerfile | 53 ++++++++++++++++ docker/php-official/5.6/Dockerfile.jinja2 | 2 +- .../5.6/conf/etc/php/php.webdevops.ini | 1 + .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- docker/php-official/7.0/Dockerfile | 53 ++++++++++++++++ docker/php-official/7.0/Dockerfile.jinja2 | 2 +- .../7.0/conf/etc/php/php.webdevops.ini | 1 + .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- docker/php-official/7.1/Dockerfile | 53 ++++++++++++++++ docker/php-official/7.1/Dockerfile.jinja2 | 2 +- .../7.1/conf/etc/php/php.webdevops.ini | 1 + .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../alpine-3/conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../centos-7/conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../debian-7/conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../debian-8/conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../debian-9/conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../conf/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../php/general/etc/php/php.webdevops.ini | 1 + .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 2 +- .../webdevops-php/tasks/bootstrap/init.yml | 2 +- template/Dockerfile/images/php.jinja2 | 62 ++++++++++++++++++- .../spec/docker/php-official_spec.rb | 24 +++++++ tests/serverspec/spec/shared/php/cli.rb | 4 -- tests/serverspec/spec/shared/php/fpm.rb | 22 +++---- tests/serverspec/spec/shared/php/modules.rb | 14 +---- tests/serverspec/spec/shared/php/service.rb | 2 +- tests/serverspec/spec/spec_config.rb | 17 ++--- 75 files changed, 334 insertions(+), 62 deletions(-) create mode 100644 tests/serverspec/spec/docker/php-official_spec.rb diff --git a/conf/console.yml b/conf/console.yml index d27561cfe..352f5d0f2 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -45,7 +45,6 @@ dockerTest: ':centos': OS_FAMILY: 'redhat' ':alpine': - PHP_MHASH: '0' PHP_REDIS: '0' ':ubuntu-12.04': PHP_REDIS: '0' @@ -61,6 +60,7 @@ dockerTest: 'php[^:]*:[0-9]': OS_FAMILY: 'debian' OS_VERSION: '8' + PHP_OFFICIAL: '1' '/liquibase': OS_FAMILY: 'alpine' OS_VERSION: '3' diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index f41eb6955..880eb7e4b 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -132,6 +132,59 @@ RUN /usr/local/bin/apt-install \ imagemagick \ graphicsmagick \ ghostscript \ + # Libraries + libldap-2.4-2 \ + libxslt1.1 \ + zlib1g \ + libpng12-0 \ + libmcrypt4 \ + # Dev and headers + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gettext \ + mysqli \ + mcrypt \ + hash \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + tokenizer \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions for PHP 5.x + && pecl install apcu-4.0.11 redis \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && 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/docker/php-official/5.6/Dockerfile.jinja2 b/docker/php-official/5.6/Dockerfile.jinja2 index 53caa7ef5..5bd80a9d2 100644 --- a/docker/php-official/5.6/Dockerfile.jinja2 +++ b/docker/php-official/5.6/Dockerfile.jinja2 @@ -18,7 +18,7 @@ {{ baseapp.debian() }} -{{ php.official() }} +{{ php.official(version='5.6') }} {{ docker.expose('9000') }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini b/docker/php-official/5.6/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini +++ b/docker/php-official/5.6/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index df39e4bd4..061c26276 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.conf + php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index e25db0c20..6a4d692b5 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -133,6 +133,59 @@ RUN /usr/local/bin/apt-install \ imagemagick \ graphicsmagick \ ghostscript \ + # Libraries + libldap-2.4-2 \ + libxslt1.1 \ + zlib1g \ + libpng12-0 \ + libmcrypt4 \ + # Dev and headers + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gettext \ + mysqli \ + mcrypt \ + hash \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + tokenizer \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions for PHP 7.x + && pecl install apcu redis \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && 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/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index bc6b3a857..8252b89dc 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -19,7 +19,7 @@ {{ baseapp.debian() }} -{{ php.official() }} +{{ php.official(version='7.0') }} {{ docker.expose('9000') }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini b/docker/php-official/7.0/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini +++ b/docker/php-official/7.0/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index df39e4bd4..061c26276 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.conf + php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index a1b95a080..fa9038a1f 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -132,6 +132,59 @@ RUN /usr/local/bin/apt-install \ imagemagick \ graphicsmagick \ ghostscript \ + # Libraries + libldap-2.4-2 \ + libxslt1.1 \ + zlib1g \ + libpng12-0 \ + libmcrypt4 \ + # Dev and headers + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gettext \ + mysqli \ + mcrypt \ + hash \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + tokenizer \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions for PHP 7.x + && pecl install apcu redis \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ && 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/docker/php-official/7.1/Dockerfile.jinja2 b/docker/php-official/7.1/Dockerfile.jinja2 index f74ada439..c2ca7614a 100644 --- a/docker/php-official/7.1/Dockerfile.jinja2 +++ b/docker/php-official/7.1/Dockerfile.jinja2 @@ -18,7 +18,7 @@ {{ baseapp.debian() }} -{{ php.official() }} +{{ php.official(version='7.1') }} {{ docker.expose('9000') }} {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }} diff --git a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini b/docker/php-official/7.1/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini +++ b/docker/php-official/7.1/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index df39e4bd4..061c26276 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.conf + php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini b/docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini +++ b/docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/alpine-3/conf/etc/php/php.webdevops.ini b/docker/php/alpine-3/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/alpine-3/conf/etc/php/php.webdevops.ini +++ b/docker/php/alpine-3/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } 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 562b8d7e2..aa1545ab8 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 @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' 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 index 857983cb3..924a86fd7 100644 --- 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 @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-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 index 51b884a48..c4c25068d 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 @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini b/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini +++ b/docker/php/centos-7-php7/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/centos-7/conf/etc/php/php.webdevops.ini b/docker/php/centos-7/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/centos-7/conf/etc/php/php.webdevops.ini +++ b/docker/php/centos-7/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/debian-7/conf/etc/php/php.webdevops.ini b/docker/php/debian-7/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/debian-7/conf/etc/php/php.webdevops.ini +++ b/docker/php/debian-7/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini b/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini +++ b/docker/php/debian-8-php7/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/debian-8/conf/etc/php/php.webdevops.ini b/docker/php/debian-8/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/debian-8/conf/etc/php/php.webdevops.ini +++ b/docker/php/debian-8/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/debian-9/conf/etc/php/php.webdevops.ini b/docker/php/debian-9/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/debian-9/conf/etc/php/php.webdevops.ini +++ b/docker/php/debian-9/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-12.04/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-14.04/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-15.04/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-15.10/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-16.04/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini b/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini +++ b/docker/php/ubuntu-16.10/conf/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/provisioning/php/general/etc/php/php.webdevops.ini b/provisioning/php/general/etc/php/php.webdevops.ini index 562b8d7e2..aa1545ab8 100644 --- a/provisioning/php/general/etc/php/php.webdevops.ini +++ b/provisioning/php/general/etc/php/php.webdevops.ini @@ -5,6 +5,7 @@ ; this file will overwrite default php.ini settings display_errors = 0 +log_errors = 1 short_open_tag = Off variables_order = 'GPCS' diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 857983cb3..924a86fd7 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -33,6 +33,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertafter: '\[global\]' with_items: - { key: 'error_log', value: "/docker.stderr" } - { key: 'pid', value: "/var/run/php-fpm.pid" } diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index 51b884a48..c4c25068d 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -43,7 +43,7 @@ regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' with_items: - - { key: 'listen', value: "0.0.0.0:9000" } + - { key: 'listen', value: "[::]:9000" } - { key: 'catch_workers_output', value: "yes" } - { key: 'access.format', value: '[php-fpm:access] %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%' } - { key: 'access.log', value: "/docker.stdout" } diff --git a/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml index df39e4bd4..061c26276 100644 --- a/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.conf + php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 1ccb28f5e..2cd390b1b 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -1,13 +1,73 @@ {% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} -{% macro official(role='') -%} +{% macro official(role='', version='') -%} # Install php environment RUN /usr/local/bin/apt-install \ # Install tools imagemagick \ graphicsmagick \ ghostscript \ + # Libraries + libldap-2.4-2 \ + libxslt1.1 \ + zlib1g \ + libpng12-0 \ + libmcrypt4 \ + # Dev and headers + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ + # Install extensions + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gettext \ + mysqli \ + mcrypt \ + hash \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + tokenizer \ + sysvmsg \ + sysvsem \ + sysvshm \ + shmop \ + xsl \ + zip \ + gd \ + gettext \ + opcache \ + # Uninstall dev and header packages + && apt-get purge -y -f --force-yes \ + libbz2-dev \ + libldap2-dev \ + libldb-dev \ + libmcrypt-dev \ + libxml2-dev \ + libxslt1-dev \ + zlib1g-dev \ + libpng12-dev \ +{%- if version|int == 5 %} + # Install extensions for PHP 5.x + && pecl install apcu-4.0.11 redis \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ +{%- else %} + # Install extensions for PHP 7.x + && pecl install apcu redis \ + && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ + && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ +{%- endif %} && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} diff --git a/tests/serverspec/spec/docker/php-official_spec.rb b/tests/serverspec/spec/docker/php-official_spec.rb new file mode 100644 index 000000000..1cf32ab50 --- /dev/null +++ b/tests/serverspec/spec/docker/php-official_spec.rb @@ -0,0 +1,24 @@ +require 'serverspec' +require 'docker' +require 'spec_init' + +describe "Dockerfile" do + before(:all) do + set :docker_image, ENV['DOCKERIMAGE_ID'] + end + + include_examples 'collection::bootstrap' + include_examples 'collection::base' + include_examples 'collection::base-app' + + if ($testConfiguration[:php] == 5) + include_examples 'collection::php5::production' + include_examples 'collection::php-fpm5' + include_examples 'collection::php-fpm5::public' + else + include_examples 'collection::php7::production' + include_examples 'collection::php-fpm7' + include_examples 'collection::php-fpm7::public' + end + +end diff --git a/tests/serverspec/spec/shared/php/cli.rb b/tests/serverspec/spec/shared/php/cli.rb index e4271a286..9c221bf33 100644 --- a/tests/serverspec/spec/shared/php/cli.rb +++ b/tests/serverspec/spec/shared/php/cli.rb @@ -1,8 +1,4 @@ shared_examples 'php::cli' do - it "should include php cli" do - expect(file("php")).to be_executable - end - describe command('php -i') do its(:exit_status) { should eq 0 } end diff --git a/tests/serverspec/spec/shared/php/fpm.rb b/tests/serverspec/spec/shared/php/fpm.rb index fe59b23f8..10f935b0a 100644 --- a/tests/serverspec/spec/shared/php/fpm.rb +++ b/tests/serverspec/spec/shared/php/fpm.rb @@ -12,7 +12,9 @@ shared_examples 'php-fpm5::layout' do it "should have local php-fpm 5.x layout" do - if os[:family] == 'redhat' + if $testConfiguration[:phpOfficialImage] + expect(file("/usr/local/etc/php-fpm.d")).to be_symlink + elsif os[:family] == 'redhat' expect(file("/etc/php-fpm.d")).to be_symlink elsif ['debian', 'ubuntu'].include?(os[:family]) expect(file("/etc/php5/fpm/pool.d")).to be_symlink @@ -23,7 +25,9 @@ shared_examples 'php-fpm7::layout' do it "should have local php-fpm 7.x layout" do - if os[:family] == 'redhat' + if $testConfiguration[:phpOfficialImage] + expect(file("/usr/local/etc/php-fpm.d")).to be_symlink + elsif os[:family] == 'redhat' expect(file("/etc/php-fpm.d")).to be_symlink elsif ['debian', 'ubuntu'].include?(os[:family]) expect(file("/etc/php/7.0/fpm/pool.d")).to be_symlink @@ -33,21 +37,17 @@ shared_examples 'php-fpm::listening::public' do describe port(9000) do - it "php-fpm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.on('0.0.0.0').with('tcp') + it "php-fpm should be listening", :retry => 5, :retry_wait => 3 do + should be_listening.on('::').with('tcp6') end end end shared_examples 'php-fpm::listening::local-only' do describe port(9000) do - it "php-fpm should NOT be listening public", :retry => 20, :retry_wait => 3 do - should_not be_listening.on('0.0.0.0') - end - end - - describe port(9000) do - it "php-fpm should be listening local", :retry => 20, :retry_wait => 3 do + it "php-fpm should be listening local", :retry => 5, :retry_wait => 3 do + should_not be_listening.on('0.0.0.0').with('tcp') + should_not be_listening.on('::').with('tcp6') should be_listening.on('127.0.0.1').with('tcp') end end diff --git a/tests/serverspec/spec/shared/php/modules.rb b/tests/serverspec/spec/shared/php/modules.rb index 1e1ae638e..4a693ebc8 100644 --- a/tests/serverspec/spec/shared/php/modules.rb +++ b/tests/serverspec/spec/shared/php/modules.rb @@ -20,7 +20,7 @@ its(:stdout) { should contain('hash') } its(:stdout) { should contain('iconv') } its(:stdout) { should contain('json') } - its(:stdout) { should contain('ldap') } + #its(:stdout) { should contain('ldap') } its(:stdout) { should contain('libxml') } its(:stdout) { should contain('mbstring') } its(:stdout) { should contain('mysqli') } @@ -48,7 +48,7 @@ its(:stdout) { should contain('tokenizer') } its(:stdout) { should contain('xml') } its(:stdout) { should contain('xmlreader') } - its(:stdout) { should contain('xmlrpc') } + #its(:stdout) { should contain('xmlrpc') } its(:stdout) { should contain('xmlwriter') } its(:stdout) { should contain('xsl') } its(:stdout) { should contain('zip') } @@ -96,14 +96,6 @@ describe command('php -m') do its(:stdout) { should contain('shmop') } - if ( $testConfiguration[:phpMhash] ) - its(:stdout) { should contain('mhash') } - else - its(:stdout) { should_not contain('mhash') } - end - - its(:stdout) { should contain('wddx') } - if ( $testConfiguration[:phpRedis] ) its(:stdout) { should contain('redis') } else @@ -148,7 +140,7 @@ its(:stdout) { should contain('hash') } its(:stdout) { should contain('iconv') } its(:stdout) { should contain('json') } - its(:stdout) { should contain('ldap') } + #its(:stdout) { should contain('ldap') } its(:stdout) { should contain('libxml') } its(:stdout) { should contain('mbstring') } its(:stdout) { should contain('mysqli') } diff --git a/tests/serverspec/spec/shared/php/service.rb b/tests/serverspec/spec/shared/php/service.rb index 920500698..9e3203a87 100644 --- a/tests/serverspec/spec/shared/php/service.rb +++ b/tests/serverspec/spec/shared/php/service.rb @@ -1,6 +1,6 @@ shared_examples 'php-fpm::service::running' do describe "service php-fpm check" do - it "should have running php-fpm daemon", :retry => 20, :retry_wait => 3 do + it "should have running php-fpm daemon", :retry => 5, :retry_wait => 3 do cmd = command("service php-fpm check") expect(cmd.stdout).to match('ok') expect(cmd.exit_status).to eq 0 diff --git a/tests/serverspec/spec/spec_config.rb b/tests/serverspec/spec/spec_config.rb index fbeec5655..e7012a39e 100644 --- a/tests/serverspec/spec/spec_config.rb +++ b/tests/serverspec/spec/spec_config.rb @@ -39,8 +39,8 @@ $testConfiguration[:phpXdebug] = true $testConfiguration[:phpApcu] = true $testConfiguration[:phpRedis] = true -$testConfiguration[:phpMhash] = true $testConfiguration[:phpBlackfire] = false +$testConfiguration[:phpOfficialImage] = false if ((os[:family] == 'ubuntu' and os[:version] == '12.04') or (os[:family] == 'ubuntu' and os[:version] == '14.04') or @@ -50,14 +50,21 @@ (os[:family] == 'debian' and os[:version] == '7') or (os[:family] == 'debian' and os[:version] == '8') or (os[:family] == 'alpine' and os[:version] == '3') or - (ENV['DOCKER_TAG'].match('php5'))) + (ENV['DOCKER_TAG'].match('php5')) or + (ENV['DOCKER_TAG'] =~ /^5\.[0-9]+/) + ) $testConfiguration[:php] = 5 end -if (ENV['DOCKER_TAG'].match('php7')) +if ((ENV['DOCKER_TAG'].match('php7')) or + (ENV['DOCKER_TAG'] =~ /^7\.[0-9]+/) + ) $testConfiguration[:php] = 7 end +if ENV['PHP_OFFICIAL'] and ENV['PHP_OFFICIAL'] == "1" + $testConfiguration[:phpOfficialImage] = true +end if ENV['PHP_XDEBUG'] and ENV['PHP_XDEBUG'] == "0" $testConfiguration[:phpXdebug] = false @@ -71,10 +78,6 @@ $testConfiguration[:phpRedis] = false end -if ENV['PHP_MHASH'] and ENV['PHP_MHASH'] == "0" - $testConfiguration[:phpMhash] = false -end - if ENV['PHP_BLACKFIRE'] and ENV['PHP_BLACKFIRE'] == "1" $testConfiguration[:phpBlackfire] = true $testConfiguration[:phpXdebug] = false From e775f40d029740bec73304a84ea169dda9852387 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 8 Apr 2017 23:39:24 +0200 Subject: [PATCH 24/58] Fix php images - Fix official php images - Cleanup dev images (remove tools, please use composer) --- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- docker/php-dev/5.6/Dockerfile | 6 ++--- docker/php-dev/5.6/Dockerfile.jinja2 | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- docker/php-dev/7.0/Dockerfile | 6 ++--- docker/php-dev/7.0/Dockerfile.jinja2 | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- docker/php-dev/7.1/Dockerfile | 6 ++--- docker/php-dev/7.1/Dockerfile.jinja2 | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- docker/php-official/5.6/Dockerfile | 3 +++ .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ docker/php-official/7.0/Dockerfile | 3 +++ .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ docker/php-official/7.1/Dockerfile | 3 +++ .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../webdevops-php/tasks/bootstrap/init.yml | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../provision/entrypoint.d/10-php-debugger.sh | 3 ++- .../webdevops-php-dev/tasks/bootstrap.yml | 1 - .../tasks/bootstrap/tools.yml | 23 ------------------- .../bin/service.d/php-fpm.d/11-clear-env.sh | 2 +- .../tasks/bootstrap/php-fpm.main.yml | 1 + .../tasks/bootstrap/php-fpm.pool.yml | 9 ++++++++ .../tasks/bootstrap/php.debian.yml | 4 ++-- .../webdevops-php/tasks/bootstrap/init.yml | 2 +- template/Dockerfile/images/php.jinja2 | 21 ++++++++++++++++- tests/serverspec/spec/collection/php-tools.rb | 1 - tests/serverspec/spec/shared/php/fpm.rb | 6 ++--- tests/serverspec/spec/shared/php/modules.rb | 10 +------- tests/serverspec/spec/shared/php/tools.rb | 14 ----------- 256 files changed, 397 insertions(+), 1473 deletions(-) delete mode 100644 docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.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/tools.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index e6e0abe8f..a95831169 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -16,12 +16,10 @@ COPY conf/ /opt/docker/ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ && /usr/local/bin/apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ blackfire-php \ blackfire-agent \ + && pecl install xdebug \ + && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services && /opt/docker/bin/control.sh service.enable ssh \ && /opt/docker/bin/control.sh service.enable postfix \ diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 index 95f501235..21201b972 100644 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -4,4 +4,4 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ php5dev.debian() }} +{{ php.officialDevelopment(version="5.6") }} diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index e76fdaed3..c153285c3 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -16,12 +16,10 @@ COPY conf/ /opt/docker/ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ && /usr/local/bin/apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ blackfire-php \ blackfire-agent \ + && pecl install xdebug \ + && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services && /opt/docker/bin/control.sh service.enable ssh \ && /opt/docker/bin/control.sh service.enable postfix \ diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 index a85f1f7c7..8f30392ce 100644 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -4,4 +4,4 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ php5dev.debian() }} +{{ php.officialDevelopment(version="7.0") }} diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index e2543f3ab..147145042 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -16,12 +16,10 @@ COPY conf/ /opt/docker/ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ && /usr/local/bin/apt-install \ - # Install tools - graphviz \ - # Install php development stuff - php5-xdebug \ blackfire-php \ blackfire-agent \ + && pecl install xdebug \ + && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services && /opt/docker/bin/control.sh service.enable ssh \ && /opt/docker/bin/control.sh service.enable postfix \ diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 index d594a2db6..0874867da 100644 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -4,4 +4,4 @@ {{ docker.copy('conf/', '/opt/docker/') }} -{{ php5dev.debian() }} +{{ php.officialDevelopment(version="7.1") }} diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml 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 deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.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/tools.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 7156e28aa..1143a4e69 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml index 2c5d76e3d..ff02b05fc 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 880eb7e4b..b9084466a 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -185,11 +185,14 @@ RUN /usr/local/bin/apt-install \ && pecl install apcu-4.0.11 redis \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && 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 \ && /usr/local/bin/docker-image-cleanup +WORKDIR / + EXPOSE 9000 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index 061c26276..df39e4bd4 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf + php_main_conf: /usr/local/etc/php-fpm.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 6a4d692b5..ec47899e4 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -186,11 +186,14 @@ RUN /usr/local/bin/apt-install \ && pecl install apcu redis \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && 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 \ && /usr/local/bin/docker-image-cleanup +WORKDIR / + EXPOSE 9000 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index 061c26276..df39e4bd4 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf + php_main_conf: /usr/local/etc/php-fpm.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index fa9038a1f..3f0bbc64d 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -185,11 +185,14 @@ RUN /usr/local/bin/apt-install \ && pecl install apcu redis \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && 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 \ && /usr/local/bin/docker-image-cleanup +WORKDIR / + EXPOSE 9000 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml index 061c26276..df39e4bd4 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf + php_main_conf: /usr/local/etc/php-fpm.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' 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 index 8bfb3c036..ef6fd4016 100644 --- 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 @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty 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 index 924a86fd7..c149d8728 100644 --- 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 @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) 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 c4c25068d..ab0b7b02c 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 @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/centos-7-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/centos-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/centos-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/debian-7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/debian-8-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-8/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/debian-8/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/debian-9/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/debian-9/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-12.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-12.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-14.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-14.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-15.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-15.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-15.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.04/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-16.04/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/docker/php/ubuntu-16.10/conf/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/docker/php/ubuntu-16.10/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' 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 7156e28aa..1143a4e69 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 @@ -15,7 +15,8 @@ PHP_CONF_PATHS=" /etc/php5/fpm/conf.d /etc/php/7.0/mods-available /etc/php/7.0/cli/conf.d -/etc/php/7.0/fpm/conf.d" +/etc/php/7.0/fpm/conf.d +/usr/local/etc/php/conf.d/" function phpModuleRemove() { if [ "$#" -ne 1 ]; then 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 2c5d76e3d..ff02b05fc 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 @@ -1,6 +1,5 @@ --- -- include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml - include: bootstrap/php-module.yml - include: bootstrap/php-module.opcache.yml diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml deleted file mode 100644 index c49cb0e34..000000000 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/tools.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- 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/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh index 8bfb3c036..ef6fd4016 100644 --- a/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh +++ b/provisioning/php/general/bin/service.d/php-fpm.d/11-clear-env.sh @@ -33,6 +33,6 @@ done go-replace \ -s ";#CLEAR_ENV_WORKAROUND#" -r "$VARIABLE_LIST" \ --path=/opt/docker/etc/php/fpm/pool.d/ \ - --path-pattern= '*.conf' \ + --path-pattern='*.conf' \ --ignore-empty diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml index 924a86fd7..c149d8728 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml @@ -43,6 +43,7 @@ dest: '/opt/docker/etc/php/fpm/php-fpm.conf' regexp: '^[\s;]*{{ item.key }}[\s]*=' line: '{{ item.key }} = {{ item.value }}' + insertbefore: '[\s]*include[\s]*=' with_items: - { key: 'daemonize', value: 'no' } when: ( php_version | version_compare('7.0.0', '<') ) diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml index c4c25068d..ab0b7b02c 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml @@ -53,6 +53,15 @@ - { key: 'user', value: "{{ APPLICATION_USER }}" } - { key: 'group', value: "{{ APPLICATION_GROUP }}" } +- name: Configure php-fpm pool user (application.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" } + when: php_version | version_compare('5.5.99', '<=') + - name: Configure php-fpm pool user (application.conf) lineinfile: dest: '/opt/docker/etc/php/fpm/pool.d/application.conf' diff --git a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml index 7d4b72f2a..d27037e33 100644 --- a/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml +++ b/provisioning/php/general/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml @@ -8,11 +8,11 @@ state: link with_items: # PHP cli - - { category: 'cli', file: '/etc/php5/mods-available/mcrypt.ini', target: '20-mcrypt.ini' } + - { category: 'cli', file: '{{ php_etc_dir }}/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: '{{ php_etc_dir }}/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' diff --git a/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml index 061c26276..df39e4bd4 100644 --- a/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml +++ b/provisioning/php/official/provision/roles/webdevops-php/tasks/bootstrap/init.yml @@ -17,7 +17,7 @@ - name: Set php main file (official) set_fact: php_etc_dir: /usr/local/etc/php - php_main_conf: /usr/local/etc/php-fpm.d/zz-docker.conf + php_main_conf: /usr/local/etc/php-fpm.conf php_pool_conf: www.conf php_pool_dir: /usr/local/etc/php-fpm.d php_fpm_bin: /usr/local/sbin/php-fpm diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2 index 2cd390b1b..d9a4273ba 100644 --- a/template/Dockerfile/images/php.jinja2 +++ b/template/Dockerfile/images/php.jinja2 @@ -1,5 +1,6 @@ -{% import 'Dockerfile/docker.jinja2' as docker %} +{% import 'Dockerfile/docker.jinja2' as docker %} {% import 'Dockerfile/provision.jinja2' as provision %} +{% import 'Dockerfile/services.jinja2' as services %} {% macro official(role='', version='') -%} # Install php environment @@ -68,7 +69,25 @@ RUN /usr/local/bin/apt-install \ && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \ && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \ {%- endif %} + && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ {{ provision.runRoleInline('php', role) }} \ {{ docker.cleanup() }} + +WORKDIR / +{%- endmacro %} + + +{% macro officialDevelopment(role='', version='') -%} +# Install development environment +RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ + && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \ + && /usr/local/bin/apt-install \ + blackfire-php \ + blackfire-agent \ + && pecl install xdebug \ + && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ + {{ services.phpDev() }} \ + {{ provision.runRoleInline('dev', 'php-dev', role) }} \ + {{ docker.cleanup() }} {%- endmacro %} diff --git a/tests/serverspec/spec/collection/php-tools.rb b/tests/serverspec/spec/collection/php-tools.rb index d6e5d6d06..6f68d4e34 100644 --- a/tests/serverspec/spec/collection/php-tools.rb +++ b/tests/serverspec/spec/collection/php-tools.rb @@ -1,6 +1,5 @@ shared_examples 'collection::php-tools' do include_examples 'php::tools' - include_examples 'misc::graphviz' end diff --git a/tests/serverspec/spec/shared/php/fpm.rb b/tests/serverspec/spec/shared/php/fpm.rb index 10f935b0a..e1605dbe1 100644 --- a/tests/serverspec/spec/shared/php/fpm.rb +++ b/tests/serverspec/spec/shared/php/fpm.rb @@ -37,15 +37,15 @@ shared_examples 'php-fpm::listening::public' do describe port(9000) do - it "php-fpm should be listening", :retry => 5, :retry_wait => 3 do - should be_listening.on('::').with('tcp6') + it "php-fpm should be listening", :retry => 10, :retry_wait => 3 do + should be_listening end end end shared_examples 'php-fpm::listening::local-only' do describe port(9000) do - it "php-fpm should be listening local", :retry => 5, :retry_wait => 3 do + it "php-fpm should be listening local", :retry => 10, :retry_wait => 3 do should_not be_listening.on('0.0.0.0').with('tcp') should_not be_listening.on('::').with('tcp6') should be_listening.on('127.0.0.1').with('tcp') diff --git a/tests/serverspec/spec/shared/php/modules.rb b/tests/serverspec/spec/shared/php/modules.rb index 4a693ebc8..717d5ef53 100644 --- a/tests/serverspec/spec/shared/php/modules.rb +++ b/tests/serverspec/spec/shared/php/modules.rb @@ -168,7 +168,7 @@ its(:stdout) { should contain('tokenizer') } its(:stdout) { should contain('xml') } its(:stdout) { should contain('xmlreader') } - its(:stdout) { should contain('xmlrpc') } + # its(:stdout) { should contain('xmlrpc') } its(:stdout) { should contain('xmlwriter') } its(:stdout) { should contain('xsl') } its(:stdout) { should contain('zip') } @@ -216,14 +216,6 @@ describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do its(:stdout) { should contain('shmop') } - if ( $testConfiguration[:phpMhash] ) - its(:stdout) { should contain('mhash') } - else - its(:stdout) { should_not contain('mhash') } - end - - its(:stdout) { should contain('wddx') } - if ( $testConfiguration[:phpRedis] ) its(:stdout) { should contain('redis') } else diff --git a/tests/serverspec/spec/shared/php/tools.rb b/tests/serverspec/spec/shared/php/tools.rb index e36c68f55..c03ef4eea 100644 --- a/tests/serverspec/spec/shared/php/tools.rb +++ b/tests/serverspec/spec/shared/php/tools.rb @@ -2,20 +2,6 @@ [ "/usr/local/bin/composer", - "/usr/local/bin/phploc", - "/usr/local/bin/pdepend", - "/usr/local/bin/phpmd", - "/usr/local/bin/phpcs", - "/usr/local/bin/phpcbf", - "/usr/local/bin/phpcpd", - "/usr/local/bin/phpdcd", - "/usr/local/bin/phpmetrics", - "/usr/local/bin/php-cs-fixer", - "/usr/local/bin/deprecation-detector", - "/usr/local/bin/php7cc", - "/usr/local/bin/phpunit", - "/usr/local/bin/phpspec" - ].each do |file| describe file("#{file}") do From deae276ccd72b7e10717a61620ddd5d4a7602e29 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 19:37:13 +0200 Subject: [PATCH 25/58] Update go-replace version to 0.5.3 --- docker/bootstrap/alpine-3/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- template/Dockerfile/tools.jinja2 | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 1e27877ad..69d329cc6 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && gosu nobody true \ && apk del .gosu-deps \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index bc6b3f71c..5b82ac214 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 3b7db396b..fa279ae39 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 79264bbbf..beaba7588 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 0928e06fe..1a25d489b 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index b5a8312be..dfc97ecff 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -50,7 +50,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 6aa466284..9de36632b 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 4a20b14cf..985948a11 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index f3e1bdaae..ad79f9cda 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 71720ea82..86ec15081 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index f529bb5be..d0b623fdc 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index b9084466a..e4ad46fb9 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -58,7 +58,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index ec47899e4..259725ccf 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -59,7 +59,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 3f0bbc64d..05e3a0d7f 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -58,7 +58,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 4798a6e73..527dc703c 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -53,7 +53,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index eeac1ddf1..54f414659 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,6 +1,6 @@ {% macro goreplace() -%} ## Install go-replace - && GOREPLACE_VERSION=0.5.2 \ + && GOREPLACE_VERSION=0.5.3 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ {%- endmacro %} From 0900175b47a4f56984ab60cce0e313a076fb9f32 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 21:21:46 +0200 Subject: [PATCH 26/58] Implement docker-service scripts --- docker/base/alpine-3/conf/bin/bootstrap.sh | 5 +++ docker/base/alpine-3/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/base/centos-7/conf/bin/bootstrap.sh | 5 +++ docker/base/centos-7/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/base/debian-7/conf/bin/bootstrap.sh | 5 +++ docker/base/debian-7/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/base/debian-8/conf/bin/bootstrap.sh | 5 +++ docker/base/debian-8/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/base/debian-9/conf/bin/bootstrap.sh | 5 +++ docker/base/debian-9/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-12.04/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-12.04/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-14.04/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-14.04/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-15.04/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-15.04/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-15.10/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-15.10/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-16.04/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-16.04/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../base/ubuntu-16.10/conf/bin/bootstrap.sh | 5 +++ docker/base/ubuntu-16.10/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- docker/php-dev/5.6/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/7.0/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/7.1/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/alpine-3-php7/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/alpine-3/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/centos-7-php56/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/centos-7-php7/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/centos-7/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/debian-7/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/debian-8-php7/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/debian-8/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/debian-9/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-12.04/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-14.04/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-15.04/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-15.10/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-16.04/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- docker/php-dev/ubuntu-16.10/Dockerfile | 4 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- docker/php-official/5.6/conf/bin/bootstrap.sh | 5 +++ docker/php-official/5.6/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/php-official/7.0/conf/bin/bootstrap.sh | 5 +++ docker/php-official/7.0/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/php-official/7.1/conf/bin/bootstrap.sh | 5 +++ docker/php-official/7.1/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ docker/php/alpine-3-php7/Dockerfile | 2 +- docker/php/alpine-3/Dockerfile | 2 +- docker/php/centos-7-php56/Dockerfile | 2 +- docker/php/centos-7-php7/Dockerfile | 2 +- docker/php/centos-7/Dockerfile | 2 +- docker/php/debian-7/Dockerfile | 2 +- docker/php/debian-8-php7/Dockerfile | 2 +- docker/php/debian-8/Dockerfile | 2 +- docker/php/debian-9/Dockerfile | 2 +- docker/php/ubuntu-12.04/Dockerfile | 2 +- docker/php/ubuntu-14.04/Dockerfile | 2 +- docker/php/ubuntu-15.04/Dockerfile | 2 +- docker/php/ubuntu-15.10/Dockerfile | 2 +- docker/php/ubuntu-16.04/Dockerfile | 2 +- docker/php/ubuntu-16.10/Dockerfile | 2 +- .../latest/conf/bin/bootstrap.sh | 5 +++ .../latest/conf/bin/control.sh | 34 ++------------- .../conf/bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../conf/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../content/Customization/supervisord.rst | 17 ++++++-- provisioning/base/general/bin/bootstrap.sh | 5 +++ provisioning/base/general/bin/control.sh | 34 ++------------- .../bin/usr-bin/docker-service-disable | 30 ++++++++++++++ .../general/bin/usr-bin/docker-service-enable | 41 +++++++++++++++++++ .../roles/webdevops-dev/tasks/bootstrap.yml | 3 -- .../provision/entrypoint.d/10-php-debugger.sh | 2 +- template/Dockerfile/services.jinja2 | 6 +-- 173 files changed, 1403 insertions(+), 649 deletions(-) create mode 100644 docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/centos-7/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/centos-7/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/debian-7/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/debian-8/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable create mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable create mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable create mode 100644 provisioning/base/general/bin/usr-bin/docker-service-disable create mode 100644 provisioning/base/general/bin/usr-bin/docker-service-enable diff --git a/docker/base/alpine-3/conf/bin/bootstrap.sh b/docker/base/alpine-3/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/alpine-3/conf/bin/bootstrap.sh +++ b/docker/base/alpine-3/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/alpine-3/conf/bin/control.sh b/docker/base/alpine-3/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/alpine-3/conf/bin/control.sh +++ b/docker/base/alpine-3/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable b/docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable b/docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/centos-7/conf/bin/bootstrap.sh b/docker/base/centos-7/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/centos-7/conf/bin/bootstrap.sh +++ b/docker/base/centos-7/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/centos-7/conf/bin/control.sh b/docker/base/centos-7/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/centos-7/conf/bin/control.sh +++ b/docker/base/centos-7/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable b/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable b/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/debian-7/conf/bin/bootstrap.sh b/docker/base/debian-7/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/debian-7/conf/bin/bootstrap.sh +++ b/docker/base/debian-7/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/base/debian-7/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/debian-7/conf/bin/control.sh +++ b/docker/base/debian-7/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/debian-8/conf/bin/bootstrap.sh b/docker/base/debian-8/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/debian-8/conf/bin/bootstrap.sh +++ b/docker/base/debian-8/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/base/debian-8/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/debian-8/conf/bin/control.sh +++ b/docker/base/debian-8/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/debian-9/conf/bin/bootstrap.sh b/docker/base/debian-9/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/debian-9/conf/bin/bootstrap.sh +++ b/docker/base/debian-9/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/base/debian-9/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/debian-9/conf/bin/control.sh +++ b/docker/base/debian-9/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/base/ubuntu-12.04/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-12.04/conf/bin/control.sh +++ b/docker/base/ubuntu-12.04/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/base/ubuntu-14.04/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-14.04/conf/bin/control.sh +++ b/docker/base/ubuntu-14.04/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-15.04/conf/bin/control.sh b/docker/base/ubuntu-15.04/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-15.04/conf/bin/control.sh +++ b/docker/base/ubuntu-15.04/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-15.10/conf/bin/control.sh b/docker/base/ubuntu-15.10/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-15.10/conf/bin/control.sh +++ b/docker/base/ubuntu-15.10/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-16.04/conf/bin/control.sh b/docker/base/ubuntu-16.04/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-16.04/conf/bin/control.sh +++ b/docker/base/ubuntu-16.04/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/base/ubuntu-16.10/conf/bin/control.sh b/docker/base/ubuntu-16.10/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/base/ubuntu-16.10/conf/bin/control.sh +++ b/docker/base/ubuntu-16.10/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index a95831169..42eee5dfc 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -21,8 +21,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index c153285c3..97917d556 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -21,8 +21,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 147145042..a754d61d7 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -21,8 +21,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 900accc23..aee08488a 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -19,8 +19,8 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php7-xdebug \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 3af7f0733..4660fd7a0 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -19,8 +19,8 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php5-xdebug \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index d5136587d..a2a2cd028 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -21,8 +21,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 14d1f6ea7..a68e86836 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -21,8 +21,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 9ef8fc6e3..e41c6eb1d 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -22,8 +22,8 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index bce399c44..725d1268b 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 04f4879f5..1e66874fd 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index d9bb70368..bb53b694e 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 2924edbcc..37f38f029 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 9ff0f9e1e..b01207627 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index f5f16957c..847b0770d 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index b27f71f34..4f27e6461 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 39b090ebf..c44a2749c 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 8f2086dd0..4e8b9acab 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index 2225e8908..b410d3859 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -23,8 +23,8 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix \ + && docker-service-enable ssh \ + && docker-service-enable postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" diff --git a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh index 1143a4e69..b5985a9ef 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/entrypoint.d/10-php-debugger.sh @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/docker/php-official/5.6/conf/bin/bootstrap.sh b/docker/php-official/5.6/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/php-official/5.6/conf/bin/bootstrap.sh +++ b/docker/php-official/5.6/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/php-official/5.6/conf/bin/control.sh b/docker/php-official/5.6/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/php-official/5.6/conf/bin/control.sh +++ b/docker/php-official/5.6/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/php-official/7.0/conf/bin/bootstrap.sh b/docker/php-official/7.0/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/php-official/7.0/conf/bin/bootstrap.sh +++ b/docker/php-official/7.0/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/php-official/7.0/conf/bin/control.sh b/docker/php-official/7.0/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/php-official/7.0/conf/bin/control.sh +++ b/docker/php-official/7.0/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/php-official/7.1/conf/bin/bootstrap.sh b/docker/php-official/7.1/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/php-official/7.1/conf/bin/bootstrap.sh +++ b/docker/php-official/7.1/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/php-official/7.1/conf/bin/control.sh b/docker/php-official/7.1/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/php-official/7.1/conf/bin/control.sh +++ b/docker/php-official/7.1/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index ed379fec1..4633f44f5 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -78,7 +78,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 334c09d58..a6f84229b 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -73,7 +73,7 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 267e6b5fd..57c15cd92 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -54,7 +54,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ # Cleanup && yum erase -y php-devel gcc \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 26677872d..44adac7a8 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -61,7 +61,7 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index aa9061b03..b0003ef77 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -58,7 +58,7 @@ RUN /usr/local/bin/yum-install \ # Cleanup && yum erase -y php-devel gcc \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 21ac14116..e5e34ffb3 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 40dd19ae1..51a0f0d1c 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -58,7 +58,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index b00ff7b21..414e07924 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 0be8a4754..0292deda9 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -47,7 +47,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index cc1f75cac..d87a684b9 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -48,7 +48,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 03850bb42..1a7e0cb04 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index bff4ccd18..ce76dbc61 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index d6adbee4e..809f0293c 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -49,7 +49,7 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 783497d48..a82f2ad15 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index edabf542a..4e58459ab 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -46,7 +46,7 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && /opt/docker/bin/control.sh service.enable cron \ + && docker-service-enable cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/samson-deployment/latest/conf/bin/bootstrap.sh b/docker/samson-deployment/latest/conf/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/docker/samson-deployment/latest/conf/bin/bootstrap.sh +++ b/docker/samson-deployment/latest/conf/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/docker/samson-deployment/latest/conf/bin/control.sh b/docker/samson-deployment/latest/conf/bin/control.sh index 97113b659..22d189745 100644 --- a/docker/samson-deployment/latest/conf/bin/control.sh +++ b/docker/samson-deployment/latest/conf/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/documentation/docs/content/Customization/supervisord.rst b/documentation/docs/content/Customization/supervisord.rst index 4be6eb9ce..7b43caf51 100644 --- a/documentation/docs/content/Customization/supervisord.rst +++ b/documentation/docs/content/Customization/supervisord.rst @@ -1,6 +1,6 @@ -================= -Supervisor Daemon -================= +============================ +Supervisor Daemon (Services) +============================ .. important:: Supervisor is only available in Docker images which are based on ``webdevops/base``! @@ -10,6 +10,17 @@ Introduction Supervisor daemon is used to start and supervise more than one process in Docker containers. More about supervisor can be found on supervisor homepage at http://supervisord.org/ +Enable and disable services +--------------------------- + +For enabling services run `docker-service-enable` or `docker-service-disable` inside your Dockerfile. + +eg:: + + RUN docker-service-enable ssh + +This task will also trigger an auto installation if the daemon is not installed. + Configuration ------------- diff --git a/provisioning/base/general/bin/bootstrap.sh b/provisioning/base/general/bin/bootstrap.sh index 1d1a30f72..85555ddcb 100644 --- a/provisioning/base/general/bin/bootstrap.sh +++ b/provisioning/base/general/bin/bootstrap.sh @@ -21,6 +21,11 @@ date +%s > /opt/docker/BUILDTIME # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x +# Enable usr-bin executables +find /opt/docker/bin/usr-bin -type f | while read USR_BIN_FILE; do + chmod +x -- "$USR_BIN_FILE" + ln -n -f -- "$USR_BIN_FILE" "/usr/local/bin/$(basename "$USR_BIN_FILE")" +done case "$BOOTSTRAP_MODE" in ################################### diff --git a/provisioning/base/general/bin/control.sh b/provisioning/base/general/bin/control.sh index 97113b659..22d189745 100644 --- a/provisioning/base/general/bin/control.sh +++ b/provisioning/base/general/bin/control.sh @@ -101,39 +101,13 @@ case "$CONTROL_COMMAND" in ## ------------------------------------------ "service.enable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - PROVISION_FILE="/opt/docker/provision/service.d/$1.sh" - - if [[ -f "$PROVISION_FILE" ]]; then - echo "Running provisioning for $1, please wait..." - - ## execute scripts - . "$PROVISION_FILE" - - ## remove directory (one run time) - rm -f -- "$PROVISION_FILE" - fi - - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = true' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-enable [service]<<" + docker-service-enable "$1" ;; "service.disable") - SERVICE_FILE="/opt/docker/etc/supervisor.d/$1.conf" - if [[ -f "$SERVICE_FILE" ]]; then - go-replace --mode=line \ - -s 'autostart =' -r 'autostart = false' \ - -- "$SERVICE_FILE" - else - echo "[ERROR] Service '${1}' not found (tried ${SERVICE_FILE})" - exit 1 - fi + deprecationNotice " Please use >>docker-service-disable [service]<<" + docker-service-disable "$1" ;; ## ------------------------------------------ diff --git a/provisioning/base/general/bin/usr-bin/docker-service-disable b/provisioning/base/general/bin/usr-bin/docker-service-disable new file mode 100644 index 000000000..8d91ee9a1 --- /dev/null +++ b/provisioning/base/general/bin/usr-bin/docker-service-disable @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + + ## Disable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = false' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done + diff --git a/provisioning/base/general/bin/usr-bin/docker-service-enable b/provisioning/base/general/bin/usr-bin/docker-service-enable new file mode 100644 index 000000000..aa71a67b5 --- /dev/null +++ b/provisioning/base/general/bin/usr-bin/docker-service-enable @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +source /opt/docker/bin/config.sh + +rootCheck "$0" + +if [[ "$#" -ne 1 ]]; then + echo "Usage: $0 " + exit 1 +fi + +for SERVICE in "$@"; do + SERVICE_FILE="/opt/docker/etc/supervisor.d/${SERVICE}.conf" + PROVISION_FILE="/opt/docker/provision/service.d/${SERVICE}.sh" + + # Run on demand installation/provisioning + if [[ -f "$PROVISION_FILE" ]]; then + echo "Running provisioning for ${SERVICE}, please wait..." + + ## execute scripts + . "$PROVISION_FILE" + + ## remove directory (one run time) + rm -f -- "$PROVISION_FILE" + fi + + ## Enable service + if [[ -f "$SERVICE_FILE" ]]; then + go-replace --mode=lineinfile \ + -s 'autostart =' -r 'autostart = true' \ + -- "$SERVICE_FILE" + else + echo "[ERROR] Service '${SERVICE}' not found (tried ${SERVICE_FILE})" + exit 1 + fi +done diff --git a/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml b/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml index 5c9eafbd0..3d7a494ad 100644 --- a/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml +++ b/provisioning/development/general/provision/roles/webdevops-dev/tasks/bootstrap.yml @@ -1,8 +1,5 @@ --- -- name: Enable ssh daemon - shell: "/opt/docker/bin/control.sh service.enable ssh" - - name: Set application user password user: name: "{{ APPLICATION_USER }}" 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 1143a4e69..b5985a9ef 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 @@ -41,7 +41,7 @@ if [[ -n "${PHP_DEBUGGER+x}" ]]; then blackfire) echo "PHP-Debugger: Blackfire enabled" phpModuleRemove "xdebug" - /opt/docker/bin/control.sh service.enable blackfire-agent + docker-service-enable blackfire-agent ;; none) diff --git a/template/Dockerfile/services.jinja2 b/template/Dockerfile/services.jinja2 index 9f5c9e5bd..b7c56dd89 100644 --- a/template/Dockerfile/services.jinja2 +++ b/template/Dockerfile/services.jinja2 @@ -1,11 +1,11 @@ {% macro php() -%} # Enable php services - && /opt/docker/bin/control.sh service.enable cron + && docker-service-enable cron {%- endmacro %} {% macro phpDev() -%} # Enable php development services - && /opt/docker/bin/control.sh service.enable ssh \ - && /opt/docker/bin/control.sh service.enable postfix + && docker-service-enable ssh \ + && docker-service-enable postfix {%- endmacro %} From 6f4a93665b131fcf888ab5b0bc13c2945a2758e7 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 22:04:26 +0200 Subject: [PATCH 27/58] Remove superfluous version information --- docker/ansible/alpine-3/Dockerfile | 5 ----- docker/ansible/alpine-3/Dockerfile.jinja2 | 2 -- docker/ansible/centos-7/Dockerfile | 5 ----- docker/ansible/centos-7/Dockerfile.jinja2 | 2 -- docker/ansible/debian-7/Dockerfile | 5 ----- docker/ansible/debian-7/Dockerfile.jinja2 | 2 -- docker/ansible/debian-8/Dockerfile | 5 ----- docker/ansible/debian-8/Dockerfile.jinja2 | 2 -- docker/ansible/debian-9/Dockerfile | 5 ----- docker/ansible/debian-9/Dockerfile.jinja2 | 2 -- docker/ansible/ubuntu-12.04/Dockerfile | 5 ----- docker/ansible/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/ansible/ubuntu-14.04/Dockerfile | 5 ----- docker/ansible/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/ansible/ubuntu-15.04/Dockerfile | 5 ----- docker/ansible/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/ansible/ubuntu-15.10/Dockerfile | 5 ----- docker/ansible/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/ansible/ubuntu-16.04/Dockerfile | 5 ----- docker/ansible/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/apache-dev/alpine-3/Dockerfile | 5 ----- docker/apache-dev/alpine-3/Dockerfile.jinja2 | 2 -- docker/apache-dev/centos-7/Dockerfile | 5 ----- docker/apache-dev/centos-7/Dockerfile.jinja2 | 2 -- docker/apache-dev/debian-7/Dockerfile | 5 ----- docker/apache-dev/debian-7/Dockerfile.jinja2 | 2 -- docker/apache-dev/debian-8/Dockerfile | 5 ----- docker/apache-dev/debian-8/Dockerfile.jinja2 | 2 -- docker/apache-dev/debian-9/Dockerfile | 5 ----- docker/apache-dev/debian-9/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-12.04/Dockerfile | 5 ----- docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-14.04/Dockerfile | 5 ----- docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-15.04/Dockerfile | 5 ----- docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-15.10/Dockerfile | 5 ----- docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-16.04/Dockerfile | 5 ----- docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/apache-dev/ubuntu-16.10/Dockerfile | 5 ----- docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/apache/alpine-3/Dockerfile | 5 ----- docker/apache/alpine-3/Dockerfile.jinja2 | 2 -- docker/apache/alpine-3/Dockerfile.jinja2-e | 9 +++++++++ docker/apache/centos-7/Dockerfile | 5 ----- docker/apache/centos-7/Dockerfile.jinja2 | 2 -- docker/apache/debian-7/Dockerfile | 5 ----- docker/apache/debian-7/Dockerfile.jinja2 | 2 -- docker/apache/debian-8/Dockerfile | 5 ----- docker/apache/debian-8/Dockerfile.jinja2 | 2 -- docker/apache/debian-9/Dockerfile | 5 ----- docker/apache/debian-9/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-12.04/Dockerfile | 5 ----- docker/apache/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-14.04/Dockerfile | 5 ----- docker/apache/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-15.04/Dockerfile | 5 ----- docker/apache/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-15.10/Dockerfile | 5 ----- docker/apache/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-16.04/Dockerfile | 5 ----- docker/apache/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/apache/ubuntu-16.10/Dockerfile | 5 ----- docker/apache/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/base-app/alpine-3/Dockerfile | 5 ----- docker/base-app/alpine-3/Dockerfile.jinja2 | 2 -- docker/base-app/centos-7/Dockerfile | 5 ----- docker/base-app/centos-7/Dockerfile.jinja2 | 2 -- docker/base-app/debian-7/Dockerfile | 5 ----- docker/base-app/debian-7/Dockerfile.jinja2 | 2 -- docker/base-app/debian-8/Dockerfile | 5 ----- docker/base-app/debian-8/Dockerfile.jinja2 | 2 -- docker/base-app/debian-9/Dockerfile | 5 ----- docker/base-app/debian-9/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-12.04/Dockerfile | 5 ----- docker/base-app/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-14.04/Dockerfile | 5 ----- docker/base-app/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-15.04/Dockerfile | 5 ----- docker/base-app/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-15.10/Dockerfile | 5 ----- docker/base-app/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-16.04/Dockerfile | 5 ----- docker/base-app/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/base-app/ubuntu-16.10/Dockerfile | 5 ----- docker/base-app/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/base/alpine-3/Dockerfile | 5 ----- docker/base/alpine-3/Dockerfile.jinja2 | 2 -- docker/base/centos-7/Dockerfile | 5 ----- docker/base/centos-7/Dockerfile.jinja2 | 2 -- docker/base/debian-7/Dockerfile | 5 ----- docker/base/debian-7/Dockerfile.jinja2 | 2 -- docker/base/debian-8/Dockerfile | 5 ----- docker/base/debian-8/Dockerfile.jinja2 | 2 -- docker/base/debian-9/Dockerfile | 5 ----- docker/base/debian-9/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-12.04/Dockerfile | 5 ----- docker/base/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-14.04/Dockerfile | 5 ----- docker/base/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-15.04/Dockerfile | 5 ----- docker/base/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-15.10/Dockerfile | 5 ----- docker/base/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-16.04/Dockerfile | 5 ----- docker/base/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/base/ubuntu-16.10/Dockerfile | 5 ----- docker/base/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/certbot/latest/Dockerfile | 5 ----- docker/certbot/latest/Dockerfile.jinja2 | 2 -- docker/hhvm-apache/ubuntu-14.04/Dockerfile | 5 ----- docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 5 ----- docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 5 ----- docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 5 ----- docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/hhvm/ubuntu-14.04/Dockerfile | 5 ----- docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/hhvm/ubuntu-16.04/Dockerfile | 5 ----- docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/mail-sandbox/latest/Dockerfile | 5 ----- docker/mail-sandbox/latest/Dockerfile.jinja2 | 2 -- docker/nginx-dev/alpine-3/Dockerfile | 5 ----- docker/nginx-dev/alpine-3/Dockerfile.jinja2 | 2 -- docker/nginx-dev/centos-7/Dockerfile | 5 ----- docker/nginx-dev/centos-7/Dockerfile.jinja2 | 2 -- docker/nginx-dev/debian-7/Dockerfile | 5 ----- docker/nginx-dev/debian-7/Dockerfile.jinja2 | 2 -- docker/nginx-dev/debian-8/Dockerfile | 5 ----- docker/nginx-dev/debian-8/Dockerfile.jinja2 | 2 -- docker/nginx-dev/debian-9/Dockerfile | 5 ----- docker/nginx-dev/debian-9/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-12.04/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-14.04/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-15.04/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-15.10/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-16.04/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/nginx-dev/ubuntu-16.10/Dockerfile | 5 ----- docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/nginx/alpine-3/Dockerfile | 5 ----- docker/nginx/alpine-3/Dockerfile.jinja2 | 2 -- docker/nginx/centos-7/Dockerfile | 5 ----- docker/nginx/centos-7/Dockerfile.jinja2 | 2 -- docker/nginx/debian-7/Dockerfile | 5 ----- docker/nginx/debian-7/Dockerfile.jinja2 | 2 -- docker/nginx/debian-8/Dockerfile | 5 ----- docker/nginx/debian-8/Dockerfile.jinja2 | 2 -- docker/nginx/debian-9/Dockerfile | 5 ----- docker/nginx/debian-9/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-12.04/Dockerfile | 5 ----- docker/nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-14.04/Dockerfile | 5 ----- docker/nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-15.04/Dockerfile | 5 ----- docker/nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-15.10/Dockerfile | 5 ----- docker/nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-16.04/Dockerfile | 5 ----- docker/nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/nginx/ubuntu-16.10/Dockerfile | 5 ----- docker/nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/5.6/Dockerfile | 5 ----- docker/php-apache-dev/5.6/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/7.0/Dockerfile | 5 ----- docker/php-apache-dev/7.0/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/7.1/Dockerfile | 5 ----- docker/php-apache-dev/7.1/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/alpine-3-php7/Dockerfile | 5 ----- docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/alpine-3/Dockerfile | 5 ----- docker/php-apache-dev/alpine-3/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/centos-7-php56/Dockerfile | 5 ----- docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/centos-7-php7/Dockerfile | 5 ----- docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/centos-7/Dockerfile | 5 ----- docker/php-apache-dev/centos-7/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/debian-7/Dockerfile | 5 ----- docker/php-apache-dev/debian-7/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/debian-8-php7/Dockerfile | 5 ----- docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/debian-8/Dockerfile | 5 ----- docker/php-apache-dev/debian-8/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/debian-9/Dockerfile | 5 ----- docker/php-apache-dev/debian-9/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php-apache-dev/ubuntu-16.10/Dockerfile | 5 ----- docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-apache/5.6/Dockerfile | 5 ----- docker/php-apache/5.6/Dockerfile.jinja2 | 2 -- docker/php-apache/7.0/Dockerfile | 5 ----- docker/php-apache/7.0/Dockerfile.jinja2 | 2 -- docker/php-apache/7.1/Dockerfile | 5 ----- docker/php-apache/7.1/Dockerfile.jinja2 | 2 -- docker/php-apache/alpine-3-php7/Dockerfile | 5 ----- docker/php-apache/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php-apache/alpine-3/Dockerfile | 5 ----- docker/php-apache/alpine-3/Dockerfile.jinja2 | 2 -- docker/php-apache/centos-7-php56/Dockerfile | 5 ----- docker/php-apache/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php-apache/centos-7-php7/Dockerfile | 5 ----- docker/php-apache/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php-apache/centos-7/Dockerfile | 5 ----- docker/php-apache/centos-7/Dockerfile.jinja2 | 2 -- docker/php-apache/debian-7/Dockerfile | 5 ----- docker/php-apache/debian-7/Dockerfile.jinja2 | 2 -- docker/php-apache/debian-8-php7/Dockerfile | 5 ----- docker/php-apache/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php-apache/debian-8/Dockerfile | 5 ----- docker/php-apache/debian-8/Dockerfile.jinja2 | 2 -- docker/php-apache/debian-9/Dockerfile | 5 ----- docker/php-apache/debian-9/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-12.04/Dockerfile | 5 ----- docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-14.04/Dockerfile | 5 ----- docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-15.04/Dockerfile | 5 ----- docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-15.10/Dockerfile | 5 ----- docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-16.04/Dockerfile | 5 ----- docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php-apache/ubuntu-16.10/Dockerfile | 5 ----- docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-dev/5.6/Dockerfile | 5 ----- docker/php-dev/5.6/Dockerfile.jinja2 | 2 -- docker/php-dev/7.0/Dockerfile | 5 ----- docker/php-dev/7.0/Dockerfile.jinja2 | 2 -- docker/php-dev/7.1/Dockerfile | 5 ----- docker/php-dev/7.1/Dockerfile.jinja2 | 2 -- docker/php-dev/alpine-3-php7/Dockerfile | 5 ----- docker/php-dev/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php-dev/alpine-3/Dockerfile | 5 ----- docker/php-dev/alpine-3/Dockerfile.jinja2 | 2 -- docker/php-dev/centos-7-php56/Dockerfile | 5 ----- docker/php-dev/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php-dev/centos-7-php7/Dockerfile | 5 ----- docker/php-dev/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php-dev/centos-7/Dockerfile | 5 ----- docker/php-dev/centos-7/Dockerfile.jinja2 | 2 -- docker/php-dev/debian-7/Dockerfile | 5 ----- docker/php-dev/debian-7/Dockerfile.jinja2 | 2 -- docker/php-dev/debian-8-php7/Dockerfile | 5 ----- docker/php-dev/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php-dev/debian-8/Dockerfile | 5 ----- docker/php-dev/debian-8/Dockerfile.jinja2 | 2 -- docker/php-dev/debian-9/Dockerfile | 5 ----- docker/php-dev/debian-9/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-12.04/Dockerfile | 5 ----- docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-14.04/Dockerfile | 5 ----- docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-15.04/Dockerfile | 5 ----- docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-15.10/Dockerfile | 5 ----- docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-16.04/Dockerfile | 5 ----- docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php-dev/ubuntu-16.10/Dockerfile | 5 ----- docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/5.6/Dockerfile | 5 ----- docker/php-nginx-dev/5.6/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/7.0/Dockerfile | 5 ----- docker/php-nginx-dev/7.0/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/7.1/Dockerfile | 5 ----- docker/php-nginx-dev/7.1/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 5 ----- docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/alpine-3/Dockerfile | 5 ----- docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/centos-7-php56/Dockerfile | 5 ----- docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/centos-7-php7/Dockerfile | 5 ----- docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/centos-7/Dockerfile | 5 ----- docker/php-nginx-dev/centos-7/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/debian-7/Dockerfile | 5 ----- docker/php-nginx-dev/debian-7/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/debian-8-php7/Dockerfile | 5 ----- docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/debian-8/Dockerfile | 5 ----- docker/php-nginx-dev/debian-8/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/debian-9/Dockerfile | 5 ----- docker/php-nginx-dev/debian-9/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 5 ----- docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-nginx/5.6/Dockerfile | 5 ----- docker/php-nginx/5.6/Dockerfile.jinja2 | 2 -- docker/php-nginx/7.0/Dockerfile | 5 ----- docker/php-nginx/7.0/Dockerfile.jinja2 | 2 -- docker/php-nginx/7.1/Dockerfile | 5 ----- docker/php-nginx/7.1/Dockerfile.jinja2 | 2 -- docker/php-nginx/alpine-3-php7/Dockerfile | 5 ----- docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx/alpine-3/Dockerfile | 5 ----- docker/php-nginx/alpine-3/Dockerfile.jinja2 | 2 -- docker/php-nginx/centos-7-php56/Dockerfile | 5 ----- docker/php-nginx/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php-nginx/centos-7-php7/Dockerfile | 5 ----- docker/php-nginx/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx/centos-7/Dockerfile | 5 ----- docker/php-nginx/centos-7/Dockerfile.jinja2 | 2 -- docker/php-nginx/debian-7/Dockerfile | 5 ----- docker/php-nginx/debian-7/Dockerfile.jinja2 | 2 -- docker/php-nginx/debian-8-php7/Dockerfile | 5 ----- docker/php-nginx/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php-nginx/debian-8/Dockerfile | 5 ----- docker/php-nginx/debian-8/Dockerfile.jinja2 | 2 -- docker/php-nginx/debian-9/Dockerfile | 5 ----- docker/php-nginx/debian-9/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-12.04/Dockerfile | 5 ----- docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-14.04/Dockerfile | 5 ----- docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-15.04/Dockerfile | 5 ----- docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-15.10/Dockerfile | 5 ----- docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-16.04/Dockerfile | 5 ----- docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php-nginx/ubuntu-16.10/Dockerfile | 5 ----- docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/php-official/7.0/Dockerfile | 1 - docker/php-official/7.0/Dockerfile.jinja2 | 1 - docker/php/alpine-3-php7/Dockerfile | 5 ----- docker/php/alpine-3-php7/Dockerfile.jinja2 | 2 -- docker/php/alpine-3/Dockerfile | 5 ----- docker/php/alpine-3/Dockerfile.jinja2 | 2 -- docker/php/centos-7-php56/Dockerfile | 5 ----- docker/php/centos-7-php56/Dockerfile.jinja2 | 2 -- docker/php/centos-7-php7/Dockerfile | 5 ----- docker/php/centos-7-php7/Dockerfile.jinja2 | 2 -- docker/php/centos-7/Dockerfile | 5 ----- docker/php/centos-7/Dockerfile.jinja2 | 2 -- docker/php/debian-7/Dockerfile | 5 ----- docker/php/debian-7/Dockerfile.jinja2 | 2 -- docker/php/debian-8-php7/Dockerfile | 5 ----- docker/php/debian-8-php7/Dockerfile.jinja2 | 2 -- docker/php/debian-8/Dockerfile | 5 ----- docker/php/debian-8/Dockerfile.jinja2 | 2 -- docker/php/debian-9/Dockerfile | 5 ----- docker/php/debian-9/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-12.04/Dockerfile | 5 ----- docker/php/ubuntu-12.04/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-14.04/Dockerfile | 5 ----- docker/php/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-15.04/Dockerfile | 5 ----- docker/php/ubuntu-15.04/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-15.10/Dockerfile | 5 ----- docker/php/ubuntu-15.10/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-16.04/Dockerfile | 5 ----- docker/php/ubuntu-16.04/Dockerfile.jinja2 | 2 -- docker/php/ubuntu-16.10/Dockerfile | 5 ----- docker/php/ubuntu-16.10/Dockerfile.jinja2 | 2 -- docker/piwik/ubuntu-14.04/Dockerfile | 5 ----- docker/piwik/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/postfix/latest/Dockerfile | 5 ----- docker/postfix/latest/Dockerfile.jinja2 | 2 -- docker/samson-deployment/latest/Dockerfile | 5 ----- docker/samson-deployment/latest/Dockerfile.jinja2 | 2 -- docker/sphinx/latest/Dockerfile | 5 ----- docker/sphinx/latest/Dockerfile.jinja2 | 2 -- docker/ssh/latest/Dockerfile | 5 ----- docker/ssh/latest/Dockerfile.jinja2 | 2 -- docker/storage/latest/Dockerfile | 5 ----- docker/storage/latest/Dockerfile.jinja2 | 2 -- docker/typo3/ubuntu-14.04/Dockerfile | 5 ----- docker/typo3/ubuntu-14.04/Dockerfile.jinja2 | 2 -- docker/varnish/latest/Dockerfile | 5 ----- docker/varnish/latest/Dockerfile.jinja2 | 2 -- docker/vsftp/latest/Dockerfile | 5 ----- docker/vsftp/latest/Dockerfile.jinja2 | 2 -- 399 files changed, 9 insertions(+), 1388 deletions(-) create mode 100644 docker/apache/alpine-3/Dockerfile.jinja2-e diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index cdc37b767..123cf8b21 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apk-install \ python \ diff --git a/docker/ansible/alpine-3/Dockerfile.jinja2 b/docker/ansible/alpine-3/Dockerfile.jinja2 index 4775e9f6c..6e00c7797 100644 --- a/docker/ansible/alpine-3/Dockerfile.jinja2 +++ b/docker/ansible/alpine-3/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "alpine-3") }} -{{ docker.version() }} - {{ ansible.alpine() }} diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 23f664a82..369ea60d7 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/yum-install \ epel-release \ diff --git a/docker/ansible/centos-7/Dockerfile.jinja2 b/docker/ansible/centos-7/Dockerfile.jinja2 index fb34b1c41..7576c6ac4 100644 --- a/docker/ansible/centos-7/Dockerfile.jinja2 +++ b/docker/ansible/centos-7/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "centos-7") }} -{{ docker.version() }} - {{ ansible.centos() }} diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 5b9deff11..6ed71bda3 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ # Install ansible diff --git a/docker/ansible/debian-7/Dockerfile.jinja2 b/docker/ansible/debian-7/Dockerfile.jinja2 index 9c9a1779d..a2c68b5a9 100644 --- a/docker/ansible/debian-7/Dockerfile.jinja2 +++ b/docker/ansible/debian-7/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "debian-7") }} -{{ docker.version() }} - {{ ansible.debian() }} diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index b01ba98e0..7c8603431 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ # Install ansible diff --git a/docker/ansible/debian-8/Dockerfile.jinja2 b/docker/ansible/debian-8/Dockerfile.jinja2 index 55d4daad4..ab9791753 100644 --- a/docker/ansible/debian-8/Dockerfile.jinja2 +++ b/docker/ansible/debian-8/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "debian-8") }} -{{ docker.version() }} - {{ ansible.debian() }} diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index cca61009f..96eeb6ffc 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ # Install ansible diff --git a/docker/ansible/debian-9/Dockerfile.jinja2 b/docker/ansible/debian-9/Dockerfile.jinja2 index d3a2467a9..4c0a6d9b1 100644 --- a/docker/ansible/debian-9/Dockerfile.jinja2 +++ b/docker/ansible/debian-9/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "debian-9") }} -{{ docker.version() }} - {{ ansible.debian() }} diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 0cb6aabee..7267919f0 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ python-minimal \ diff --git a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 index 507258194..f196c3603 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-12.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "ubuntu-12.04") }} -{{ docker.version() }} - {{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index a98457aee..bec13e7f2 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ python-minimal \ diff --git a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 index 1671a2ab3..5392838c9 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-14.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "ubuntu-14.04") }} -{{ docker.version() }} - {{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 8fac4e8c3..3a7bcbffa 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ python-minimal \ diff --git a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 index 51de32a4c..d40ceda61 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "ubuntu-15.04") }} -{{ docker.version() }} - {{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index dcf6eb367..a9ea0c7a3 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ python-minimal \ diff --git a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 index 3fac77507..25e140e60 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-15.10/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "ubuntu-15.10") }} -{{ docker.version() }} - {{ ansible.ubuntu() }} diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index 894169e1e..a5fef54ad 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - # Install ansible RUN /usr/local/bin/apt-install \ python-minimal \ diff --git a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 index a141abcb3..22fa88807 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/ansible/ubuntu-16.04/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap", "ubuntu-16.04") }} -{{ docker.version() }} - {{ ansible.ubuntu() }} diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile index f38b77eab..8533339b5 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/alpine-3/Dockerfile.jinja2 b/docker/apache-dev/alpine-3/Dockerfile.jinja2 index 4f8c82060..258714d7d 100644 --- a/docker/apache-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/apache-dev/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index c83a0827d..70f341c0f 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2 index 2df2e82e9..99e7363fa 100644 --- a/docker/apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/apache-dev/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 0c282d7de..a7b169561 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2 index 170f1fd82..5a35c40f0 100644 --- a/docker/apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 9c5eb294f..37abb640c 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2 index 417d75e1e..0455155eb 100644 --- a/docker/apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index dce5583cb..e58881e1a 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2 index 703871b7e..1484de6cc 100644 --- a/docker/apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/apache-dev/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 84ec113f9..cd3265be3 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 index 1ebf21f16..e418a4877 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 0616c81be..0c72ab077 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 640029ebe..8f088e4a6 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 2f933bc53..de6cffe55 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 index 9dc653089..6ea2a21b2 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index bf3133eb5..4050373da 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 index 20742a279..11620723c 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 6dc96a7fd..eb41429a0 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 index 248fcb5ad..6ff17cde4 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index bd11775e0..e534a2910 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/apache:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 index e18477a69..8714adf91 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("apache", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index 6f77885c3..22713203a 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/alpine-3/Dockerfile.jinja2 b/docker/apache/alpine-3/Dockerfile.jinja2 index ea3af4101..d5091c019 100644 --- a/docker/apache/alpine-3/Dockerfile.jinja2 +++ b/docker/apache/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/alpine-3/Dockerfile.jinja2-e b/docker/apache/alpine-3/Dockerfile.jinja2-e new file mode 100644 index 000000000..d5091c019 --- /dev/null +++ b/docker/apache/alpine-3/Dockerfile.jinja2-e @@ -0,0 +1,9 @@ +{{ docker.from("base", "alpine-3") }} + +{{ environment.web() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +{{ apache.alpine() }} + +{{ docker.expose('80 443') }} diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 35c3dec17..b96dbd5e3 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/centos-7/Dockerfile.jinja2 b/docker/apache/centos-7/Dockerfile.jinja2 index f70a561ef..374557686 100644 --- a/docker/apache/centos-7/Dockerfile.jinja2 +++ b/docker/apache/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index dc255d0a4..97436d0e8 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/debian-7/Dockerfile.jinja2 b/docker/apache/debian-7/Dockerfile.jinja2 index 94dde9aa2..686bb311e 100644 --- a/docker/apache/debian-7/Dockerfile.jinja2 +++ b/docker/apache/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 5049bcbc1..e9565e669 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/debian-8/Dockerfile.jinja2 b/docker/apache/debian-8/Dockerfile.jinja2 index 0f0452e09..74b255c92 100644 --- a/docker/apache/debian-8/Dockerfile.jinja2 +++ b/docker/apache/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 09261748b..ec4cbda07 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/debian-9/Dockerfile.jinja2 b/docker/apache/debian-9/Dockerfile.jinja2 index 768a16da4..856df6a14 100644 --- a/docker/apache/debian-9/Dockerfile.jinja2 +++ b/docker/apache/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index be6bb78d3..b753260bc 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 index 02866dc2d..e46ca3571 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index d2d6f141d..86d1729fe 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 index d72bf7c01..c1084f2f9 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 999b622e2..d181af9bf 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 index 600c3a135..10c695cc7 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index fa672a170..a37e2162a 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 index 6b77e572c..3e1e4b43f 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 1f7aba5f6..005d9643b 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 index 45da1db24..943bf8a5f 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 8e25002c8..7aa57a05f 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 index 524506fc6..72516f12a 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index 3b81601b3..2a9cf2441 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/alpine-3/Dockerfile.jinja2 b/docker/base-app/alpine-3/Dockerfile.jinja2 index c531b3392..c2321a737 100644 --- a/docker/base-app/alpine-3/Dockerfile.jinja2 +++ b/docker/base-app/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "alpine-3") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 5d0fe021e..f2e584664 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/centos-7/Dockerfile.jinja2 b/docker/base-app/centos-7/Dockerfile.jinja2 index cce7cd82e..5e982fab5 100644 --- a/docker/base-app/centos-7/Dockerfile.jinja2 +++ b/docker/base-app/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "centos-7") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 3a8eb03bd..41c60e76c 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/debian-7/Dockerfile.jinja2 b/docker/base-app/debian-7/Dockerfile.jinja2 index 96d405881..953db323a 100644 --- a/docker/base-app/debian-7/Dockerfile.jinja2 +++ b/docker/base-app/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-7") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 5af3ae09d..256b946e9 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/debian-8/Dockerfile.jinja2 b/docker/base-app/debian-8/Dockerfile.jinja2 index d91774307..935081352 100644 --- a/docker/base-app/debian-8/Dockerfile.jinja2 +++ b/docker/base-app/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-8") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index b15da2f43..00fcdf90d 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/debian-9/Dockerfile.jinja2 b/docker/base-app/debian-9/Dockerfile.jinja2 index d46543ad4..178bf2679 100644 --- a/docker/base-app/debian-9/Dockerfile.jinja2 +++ b/docker/base-app/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-9") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 24aa1001b..0880dd8c7 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 index dae317e1d..5a1424074 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 521a01cb7..fdbcbd82b 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 index ccb5cafd7..91a9ff3ac 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 629c5839a..0a616385c 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 index f506d49c2..423457dde 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 950172ad9..13b796072 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 index 7755ca662..37aa2669f 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index a883e7b6f..c772e0667 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 index 078521573..a8a6affb6 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index ea94fb95e..fc249e92a 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV APPLICATION_USER application ENV APPLICATION_GROUP application ENV APPLICATION_PATH /app diff --git a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 index 51fea842d..b32493033 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base-app/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.baseApp() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 17747d8ec..ea8edf989 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/alpine-3/Dockerfile.jinja2 b/docker/base/alpine-3/Dockerfile.jinja2 index 5bf50437f..204896571 100644 --- a/docker/base/alpine-3/Dockerfile.jinja2 +++ b/docker/base/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "alpine-3") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index fbe86fdcd..7c97f0660 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/centos-7/Dockerfile.jinja2 b/docker/base/centos-7/Dockerfile.jinja2 index 4ff468c66..66367f569 100644 --- a/docker/base/centos-7/Dockerfile.jinja2 +++ b/docker/base/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "centos-7") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 272b46278..45c128a3e 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/debian-7/Dockerfile.jinja2 b/docker/base/debian-7/Dockerfile.jinja2 index af00be0ab..5de057921 100644 --- a/docker/base/debian-7/Dockerfile.jinja2 +++ b/docker/base/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "debian-7") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 10d6ea12d..c2074a36a 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/debian-8/Dockerfile.jinja2 b/docker/base/debian-8/Dockerfile.jinja2 index 43a50dcd8..1a98267d3 100644 --- a/docker/base/debian-8/Dockerfile.jinja2 +++ b/docker/base/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "debian-8") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 00c83040d..b96410977 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/debian-9/Dockerfile.jinja2 b/docker/base/debian-9/Dockerfile.jinja2 index e752d30fe..465e29630 100644 --- a/docker/base/debian-9/Dockerfile.jinja2 +++ b/docker/base/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "debian-9") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 6099bbf1b..000312e04 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 index 94dce4340..5329168f1 100644 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 4328a154d..0883c8816 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-14.04/Dockerfile.jinja2 b/docker/base/ubuntu-14.04/Dockerfile.jinja2 index 79a8f8070..1af91a9d0 100644 --- a/docker/base/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 3718f10a8..fe1da7080 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-15.04/Dockerfile.jinja2 b/docker/base/ubuntu-15.04/Dockerfile.jinja2 index c8da9ed3b..72d259e83 100644 --- a/docker/base/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 97bdca1b7..7ec01aa73 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-15.10/Dockerfile.jinja2 b/docker/base/ubuntu-15.10/Dockerfile.jinja2 index 353795b8e..11f9e8b10 100644 --- a/docker/base/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index d1aabea4d..87afde2ef 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-16.04/Dockerfile.jinja2 b/docker/base/ubuntu-16.04/Dockerfile.jinja2 index 33b4a8278..ddcaacb01 100644 --- a/docker/base/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 3f591b732..a5a415e4e 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV DOCKER_CONF_HOME /opt/docker/ ENV LOG_STDOUT "" ENV LOG_STDERR "" diff --git a/docker/base/ubuntu-16.10/Dockerfile.jinja2 b/docker/base/ubuntu-16.10/Dockerfile.jinja2 index 758a629bd..fcd217c3f 100644 --- a/docker/base/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/base/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.base() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 62d4febbb..21137e461 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 index 91c145f29..e602246ef 100644 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ b/docker/certbot/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("bootstrap","alpine-3") }} -{{ docker.version() }} - {{ docker.volume('/etc/letsencrypt') }} {{ docker.volume('/var/www') }} diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index ab80cb618..72ed57cea 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/hhvm:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 index f3e377099..7cc62d3dc 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("hhvm", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index e8476bdb9..6537f2ea8 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/hhvm:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 index 11dc1b0db..48b4cf5ed 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("hhvm", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index d09412e65..96fc9f9b6 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/hhvm:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 index a3525392d..606c83926 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("hhvm", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 30c3e0ea2..e7f090c8a 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/hhvm:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 index 0d3295069..01ea0f3e6 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("hhvm", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 88b3ca7d2..23095fa8e 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 b/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 index 2467b22d6..d77b946f6 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/hhvm/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index bd6c95cd8..f16d889a4 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 b/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 index f2c47cf88..20db1da68 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/hhvm/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 87babffe6..2ce674257 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-nginx:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV MAILBOX_USERNAME "dev" ENV MAILBOX_PASSWORD "dev" diff --git a/docker/mail-sandbox/latest/Dockerfile.jinja2 b/docker/mail-sandbox/latest/Dockerfile.jinja2 index 16809eb41..2ebceccb2 100644 --- a/docker/mail-sandbox/latest/Dockerfile.jinja2 +++ b/docker/mail-sandbox/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-nginx") }} -{{ docker.version() }} - {{ environment.mailbox() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile index ccf7cb8cb..474cd6566 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/nginx-dev/alpine-3/Dockerfile.jinja2 index 344d02a74..0e4750f6c 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/nginx-dev/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 98c8939fe..ff452e888 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2 index 8cb9dab6c..ae74cb605 100644 --- a/docker/nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 362afb3bc..5b75700d5 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2 index 9709b08fb..57defa803 100644 --- a/docker/nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index a06c9106a..2c1756438 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2 index 363713e03..e0c62cbc8 100644 --- a/docker/nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 36fcd71f8..43097ae32 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2 index 144cd8143..949be425f 100644 --- a/docker/nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 6eb5946db..a95e02ff2 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index 33f2d2bb2..e1f358869 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index b1b76f0b9..4f23d6fcf 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index fa47fee73..2501067e7 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 4bd650376..51153c471 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index a787e39b1..ec6a93d0c 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 83e79659a..50bea1c8a 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 8a1395919..16129e677 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 33bb72605..118cd3080 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index e667c951d..5692d818d 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 24a0847a6..ced2fc10a 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/nginx:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index d2a520752..e950663f4 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("nginx", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index 2192d6eab..38f3b04fa 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/alpine-3/Dockerfile.jinja2 b/docker/nginx/alpine-3/Dockerfile.jinja2 index 0be9b5e64..dcf56b215 100644 --- a/docker/nginx/alpine-3/Dockerfile.jinja2 +++ b/docker/nginx/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 7badb5dd9..2a712283d 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/centos-7/Dockerfile.jinja2 b/docker/nginx/centos-7/Dockerfile.jinja2 index 6401fcd50..b1d4ad234 100644 --- a/docker/nginx/centos-7/Dockerfile.jinja2 +++ b/docker/nginx/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 971603984..26f6d8ec2 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/debian-7/Dockerfile.jinja2 b/docker/nginx/debian-7/Dockerfile.jinja2 index f7bc02c78..ceabe21dc 100644 --- a/docker/nginx/debian-7/Dockerfile.jinja2 +++ b/docker/nginx/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index a96a68473..7c9e65985 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/debian-8/Dockerfile.jinja2 b/docker/nginx/debian-8/Dockerfile.jinja2 index 75fae8911..90470a38f 100644 --- a/docker/nginx/debian-8/Dockerfile.jinja2 +++ b/docker/nginx/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 9b566585e..2dce7d253 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/debian-9/Dockerfile.jinja2 b/docker/nginx/debian-9/Dockerfile.jinja2 index 69e46a1d3..98d797329 100644 --- a/docker/nginx/debian-9/Dockerfile.jinja2 +++ b/docker/nginx/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 1dde487d5..b1b1fc300 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 index 275cb76f9..b87279b56 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index cbc7985b2..ad39bd700 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 index 3ef996efd..08404c0a5 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index bab53f52f..4d7102074 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 index 03f670fa2..b912380bb 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 9f0373356..ea4ae3161 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 index 8c433be7d..afcd182c1 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 2d64fba27..8efc063cb 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 index 9dfe66136..a479b11c2 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 38ffd1165..b6d4de27d 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 index 8496b2290..2f16f063e 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index f3240a495..36e2462ea 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:5.6 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/5.6/Dockerfile.jinja2 b/docker/php-apache-dev/5.6/Dockerfile.jinja2 index c097cd6b5..238ad3a06 100644 --- a/docker/php-apache-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-apache-dev/5.6/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "5.6") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index c9374a324..ebfbb208c 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:7.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/7.0/Dockerfile.jinja2 b/docker/php-apache-dev/7.0/Dockerfile.jinja2 index ffc16f8af..03f7a444e 100644 --- a/docker/php-apache-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.0/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "7.0") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index 03259a0dd..e3e457211 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:7.1 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/7.1/Dockerfile.jinja2 b/docker/php-apache-dev/7.1/Dockerfile.jinja2 index 3e883d3e4..e294d24d9 100644 --- a/docker/php-apache-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-apache-dev/7.1/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "7.1") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index f8f344637..71a175d00 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:alpine-3-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 index d4a2d1f33..705090905 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "alpine-3-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 3d68a1ef9..8dde3dc83 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 index 515caa477..54b187e1b 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index ed65c9abb..e85e5f132 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7-php56 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 index 9884776c6..a7d213f46 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7-php56") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index 621ada4ad..d8d355d96 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 index 06799f985..284ce6b2c 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index ec6da56e9..93c12af66 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 index e3596a41d..b3962dba8 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 15e2a1a21..769205509 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 index db7238d46..61d44dc04 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 885fab26d..b2f3b0ad6 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-8-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 index fc2b2a2ae..061dcb383 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-8-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index db604dc57..cc4158aa0 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 index bc690b346..1d792e13b 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index 336cc0267..d8f2d0a4e 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 index 44a199691..5db157050 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache-dev/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index d741be206..f670b12cf 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 index 526b62d9c..69c4f599f 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 888b88fb8..64df9de18 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 index 58dc1e66e..8106f83ab 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index d9d0ca115..31c28902e 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 index e7356b43d..b0d9e6299 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index b9c946690..39f455b54 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 index 6737813a9..746fdf556 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index b7d07e2dc..79a0664ab 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 index df24f9644..faf593552 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 66d1454ba..651d5ac13 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 index 88d0d4331..652708df4 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 5a9baa0d8..d0e266c12 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:5.6 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/5.6/Dockerfile.jinja2 b/docker/php-apache/5.6/Dockerfile.jinja2 index f0626df68..6d352967e 100644 --- a/docker/php-apache/5.6/Dockerfile.jinja2 +++ b/docker/php-apache/5.6/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "5.6") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 810ca60ee..f684b42be 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/7.0/Dockerfile.jinja2 b/docker/php-apache/7.0/Dockerfile.jinja2 index aad741346..1b758cde3 100644 --- a/docker/php-apache/7.0/Dockerfile.jinja2 +++ b/docker/php-apache/7.0/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.0") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 463c180b5..c1eb991bd 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.1 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/7.1/Dockerfile.jinja2 b/docker/php-apache/7.1/Dockerfile.jinja2 index 605ec8b16..50e8b75ec 100644 --- a/docker/php-apache/7.1/Dockerfile.jinja2 +++ b/docker/php-apache/7.1/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.1") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index cdbd1198a..3f3729286 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 index b740ac1d9..ba496f6ff 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index ca72f0f92..a9e17c192 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/alpine-3/Dockerfile.jinja2 b/docker/php-apache/alpine-3/Dockerfile.jinja2 index d1dd382b4..6e2aa839f 100644 --- a/docker/php-apache/alpine-3/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index e33426a94..b828b9a49 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php56 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 index bbd157465..c0231d851 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php56") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 4a15597b8..b18142d6a 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 index bc5cf8f87..e0fe82e7c 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 472d779f6..90b28a550 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/centos-7/Dockerfile.jinja2 b/docker/php-apache/centos-7/Dockerfile.jinja2 index 28e91a3ba..81a28b30c 100644 --- a/docker/php-apache/centos-7/Dockerfile.jinja2 +++ b/docker/php-apache/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index a981e9662..a0d5308b0 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/debian-7/Dockerfile.jinja2 b/docker/php-apache/debian-7/Dockerfile.jinja2 index bd3dd2882..3db5771bb 100644 --- a/docker/php-apache/debian-7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index f68edccdc..a24cd28da 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 index 4a3d427cb..31b1cc83f 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 9e2953ac0..09b284130 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/debian-8/Dockerfile.jinja2 b/docker/php-apache/debian-8/Dockerfile.jinja2 index 2dce31576..252c8871d 100644 --- a/docker/php-apache/debian-8/Dockerfile.jinja2 +++ b/docker/php-apache/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 55997ea71..a76682532 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/debian-9/Dockerfile.jinja2 b/docker/php-apache/debian-9/Dockerfile.jinja2 index 17ab1a5b9..5243234d8 100644 --- a/docker/php-apache/debian-9/Dockerfile.jinja2 +++ b/docker/php-apache/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 231ec2076..f701b5efd 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 index 4aab83610..d7c006a53 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 3de008a16..7e8a28062 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 index 90f10f302..1132aa352 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index b3a3f9003..3da2a128a 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 index bf0d4f525..1afc56d64 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index fc759ae00..189526ba5 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 index dc9ec6109..5cd02e5c8 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index eadc17829..334f0ba64 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 index 89fee4ea8..cc2e24dda 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index 4886a5901..d68e80d01 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 index 172219b62..9ce35fdd4 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-apache/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index 42eee5dfc..fed8b7583 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:5.6 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/5.6/Dockerfile.jinja2 b/docker/php-dev/5.6/Dockerfile.jinja2 index 21201b972..eeaee7317 100644 --- a/docker/php-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-dev/5.6/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "5.6") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php.officialDevelopment(version="5.6") }} diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 97917d556..251afff87 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/7.0/Dockerfile.jinja2 b/docker/php-dev/7.0/Dockerfile.jinja2 index 8f30392ce..3ea77a71d 100644 --- a/docker/php-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-dev/7.0/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.0") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php.officialDevelopment(version="7.0") }} diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index a754d61d7..8aec6e04b 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.1 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/7.1/Dockerfile.jinja2 b/docker/php-dev/7.1/Dockerfile.jinja2 index 0874867da..af4d5837d 100644 --- a/docker/php-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-dev/7.1/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.1") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php.officialDevelopment(version="7.1") }} diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index aee08488a..0039ea87c 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 index 780f0ecbc..fee0283c1 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3-php7") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.alpine() }} diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 4660fd7a0..9487975e3 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/alpine-3/Dockerfile.jinja2 b/docker/php-dev/alpine-3/Dockerfile.jinja2 index 2ef976fe7..52668dadc 100644 --- a/docker/php-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-dev/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.alpine() }} diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index a2a2cd028..ad2472d49 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php56 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ diff --git a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 index ec60cec8b..684aad399 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php56") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.webtatic() }} diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index a68e86836..42ff1dcc4 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ diff --git a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 index cfb5ffb19..7d6d0ea32 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php7") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.webtatic() }} diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index e41c6eb1d..3b6e68970 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/centos-7/Dockerfile.jinja2 b/docker/php-dev/centos-7/Dockerfile.jinja2 index fafe25a99..b3826dc4e 100644 --- a/docker/php-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-dev/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.centos() }} diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 725d1268b..811ba7d22 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/debian-7/Dockerfile.jinja2 b/docker/php-dev/debian-7/Dockerfile.jinja2 index 6f94cf373..ff010faa3 100644 --- a/docker/php-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-7") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.debian() }} diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 1e66874fd..1e7eafc89 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 index 30f869711..f95b8c96f 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8-php7") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.debianSury() }} diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index bb53b694e..791d85189 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/debian-8/Dockerfile.jinja2 b/docker/php-dev/debian-8/Dockerfile.jinja2 index 8b1c32658..7a0788482 100644 --- a/docker/php-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-dev/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.debian() }} diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 37f38f029..7ba4b65dc 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/debian-9/Dockerfile.jinja2 b/docker/php-dev/debian-9/Dockerfile.jinja2 index 5890a8f4f..32d512f39 100644 --- a/docker/php-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-dev/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-9") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.debian() }} diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index b01207627..2473933ea 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 index 9a5f1836b..88cb3745f 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-12.04") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.ubuntu() }} diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 847b0770d..0b7637049 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 index f061e1381..7f15be3b6 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-14.04") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.ubuntu() }} diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 4f27e6461..3c9b992ed 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 index 72876fc4b..4f1e5e17a 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.04") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.ubuntu() }} diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index c44a2749c..14d9b30d1 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 index b1bb02ffa..2f3ecfce1 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.10") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php5dev.ubuntu() }} diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 4e8b9acab..08d312040 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 index 5cad015b0..3c5eff25b 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.04") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.ubuntu() }} diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index b410d3859..d0f62b3f0 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ # Install development environment diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 index da4b27875..c8dffa64b 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.10") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ php7dev.ubuntu() }} diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index caaedde58..764c63c33 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:5.6 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 index 8c57cc39c..0ddd264a1 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/5.6/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "5.6") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 5dddaf877..39c8a85b3 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:7.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 index d5b15151d..540a89b14 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.0/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "7.0") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 985deed7e..c65e4f943 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:7.1 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 index 3b82f0193..d508434dd 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/7.1/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "7.1") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index d5a80944a..56744370d 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:alpine-3-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 index 2d52cb8cd..d166fca72 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "alpine-3-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index 61ddfd189..d874fc282 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 index b22f3c32b..3574af260 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 5e8a2f3a6..7c67eda04 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7-php56 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 index 690ea2869..028a39575 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7-php56") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 374e42c73..4ec56b4ed 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 index 9c9e1bc46..c20b51c83 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index d9fd15163..875856946 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 index d973b6b9b..5b6dbabb0 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index c45ec363c..790152c03 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 index b806f1625..c85f90c57 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 0dfe1d206..aa29b54d7 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-8-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 index 6161deb68..a39c254e7 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-8-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 59fc64054..7f6e39af1 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 index cf886a9ef..c6d3cc0e3 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index cd70a168f..1620f66d3 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 index 67a0fb9d8..8aad79fec 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index c4ec7a6e4..936ed0164 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 index ef6065c03..2dda3f85c 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index fa82cd0b4..c7e082a4f 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 index 722acec8d..6a989cd9c 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 40a7d7e33..097e56726 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 index 964154705..3255cde01 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 1db5a3a42..3cb04d471 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 index 9229c120d..c50586369 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 5fea027b5..cb31dd263 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 index 36e19f31c..12159d9f1 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 9c7be2872..1952fc82e 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-dev:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 index d1d748ffd..1d3be3a9d 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-dev", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} {{ environment.webDevelopment() }} diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index e170617c0..19ea2dca1 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:5.6 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/5.6/Dockerfile.jinja2 b/docker/php-nginx/5.6/Dockerfile.jinja2 index 96a6a1152..26aef0546 100644 --- a/docker/php-nginx/5.6/Dockerfile.jinja2 +++ b/docker/php-nginx/5.6/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "5.6") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 7b93594eb..447491438 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/7.0/Dockerfile.jinja2 b/docker/php-nginx/7.0/Dockerfile.jinja2 index 63820afec..b824eff56 100644 --- a/docker/php-nginx/7.0/Dockerfile.jinja2 +++ b/docker/php-nginx/7.0/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.0") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 937b64d0f..8ad3e5c6e 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:7.1 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/7.1/Dockerfile.jinja2 b/docker/php-nginx/7.1/Dockerfile.jinja2 index 42fff3a43..2bdee366d 100644 --- a/docker/php-nginx/7.1/Dockerfile.jinja2 +++ b/docker/php-nginx/7.1/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "7.1") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 7987463a6..2e2806eb4 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 index 4aabcf874..1032009b4 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index 9395cac2a..3726bb739 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/alpine-3/Dockerfile.jinja2 b/docker/php-nginx/alpine-3/Dockerfile.jinja2 index b6d43f583..80664b37e 100644 --- a/docker/php-nginx/alpine-3/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 8aa9e0dee..08cc5c758 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php56 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 index f74b18914..50efcebb3 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php56") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 7e3753f98..ea885b19a 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 index d965f3cf0..0369224d4 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 5d7ed728e..02c9ab15e 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/centos-7/Dockerfile.jinja2 b/docker/php-nginx/centos-7/Dockerfile.jinja2 index 0d36fa890..218acb628 100644 --- a/docker/php-nginx/centos-7/Dockerfile.jinja2 +++ b/docker/php-nginx/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 34025e104..3135c1839 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/debian-7/Dockerfile.jinja2 b/docker/php-nginx/debian-7/Dockerfile.jinja2 index 35a8ff69a..56c960ffe 100644 --- a/docker/php-nginx/debian-7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index a0a00ff16..3ccb49093 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8-php7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 index bc8043deb..496b43765 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8-php7") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 47f6ad73c..acda1fbc3 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/debian-8/Dockerfile.jinja2 b/docker/php-nginx/debian-8/Dockerfile.jinja2 index 3737a4195..23a30f820 100644 --- a/docker/php-nginx/debian-8/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 2b1f980ac..96bdc44a0 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/debian-9/Dockerfile.jinja2 b/docker/php-nginx/debian-9/Dockerfile.jinja2 index 10aa7604d..928785005 100644 --- a/docker/php-nginx/debian-9/Dockerfile.jinja2 +++ b/docker/php-nginx/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index fb0305574..e3a07ca61 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 index 84dbad02a..ed6f88c07 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 63037e69d..ca1c7877f 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 index b964dd07f..f33c49154 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 67106e006..fe8e013a9 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 index 706f38568..fac95f9ee 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index d116c1b9c..306ad8aba 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 index 085cbd88a..54185e764 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 6e528982d..a331121ab 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 index 54e26bbee..14e9706f8 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 3bfa7fbd7..c5c9eb92f 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 index a62d1fdcb..0260eda54 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 259725ccf..85be82a9c 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -22,7 +22,6 @@ ENV APPLICATION_PATH /app ENV APPLICATION_UID 1000 ENV APPLICATION_GID 1000 - ADD baselayout.tar / COPY conf/ /opt/docker/ diff --git a/docker/php-official/7.0/Dockerfile.jinja2 b/docker/php-official/7.0/Dockerfile.jinja2 index 8252b89dc..1292dab71 100644 --- a/docker/php-official/7.0/Dockerfile.jinja2 +++ b/docker/php-official/7.0/Dockerfile.jinja2 @@ -6,7 +6,6 @@ {{ environment.base() }} {{ environment.baseApp() }} - {{ docker.add('baselayout.tar', '/') }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 4633f44f5..0e3095d43 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/alpine-3-php7/Dockerfile.jinja2 b/docker/php/alpine-3-php7/Dockerfile.jinja2 index 99e5e3b70..f7b09fe82 100644 --- a/docker/php/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php/alpine-3-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index a6f84229b..e4b1062b4 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/alpine-3/Dockerfile.jinja2 b/docker/php/alpine-3/Dockerfile.jinja2 index 0656e234e..b910e8ac4 100644 --- a/docker/php/alpine-3/Dockerfile.jinja2 +++ b/docker/php/alpine-3/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "alpine-3") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 57c15cd92..f61e3a688 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/centos-7-php56/Dockerfile.jinja2 b/docker/php/centos-7-php56/Dockerfile.jinja2 index 4246d1bb0..9b34de366 100644 --- a/docker/php/centos-7-php56/Dockerfile.jinja2 +++ b/docker/php/centos-7-php56/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index 44adac7a8..e1a0708b3 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/centos-7-php7/Dockerfile.jinja2 b/docker/php/centos-7-php7/Dockerfile.jinja2 index 64ee19053..1f9d630b0 100644 --- a/docker/php/centos-7-php7/Dockerfile.jinja2 +++ b/docker/php/centos-7-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index b0003ef77..ac909bddd 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:centos-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/centos-7/Dockerfile.jinja2 b/docker/php/centos-7/Dockerfile.jinja2 index ccb3165ee..1f0cb6b72 100644 --- a/docker/php/centos-7/Dockerfile.jinja2 +++ b/docker/php/centos-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "centos-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index e5e34ffb3..99face657 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:debian-7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/debian-7/Dockerfile.jinja2 b/docker/php/debian-7/Dockerfile.jinja2 index 2dde687bd..91eea7c92 100644 --- a/docker/php/debian-7/Dockerfile.jinja2 +++ b/docker/php/debian-7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "debian-7") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 51a0f0d1c..3ac5deb03 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/debian-8-php7/Dockerfile.jinja2 b/docker/php/debian-8-php7/Dockerfile.jinja2 index 248924e90..e6fd2199b 100644 --- a/docker/php/debian-8-php7/Dockerfile.jinja2 +++ b/docker/php/debian-8-php7/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 414e07924..0703b2877 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:debian-8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/debian-8/Dockerfile.jinja2 b/docker/php/debian-8/Dockerfile.jinja2 index 27a370861..03dacf80e 100644 --- a/docker/php/debian-8/Dockerfile.jinja2 +++ b/docker/php/debian-8/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "debian-8") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 0292deda9..c893c7bb8 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:debian-9 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/debian-9/Dockerfile.jinja2 b/docker/php/debian-9/Dockerfile.jinja2 index 43a1866d3..0e9ea8c0a 100644 --- a/docker/php/debian-9/Dockerfile.jinja2 +++ b/docker/php/debian-9/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "debian-9") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index d87a684b9..053a2f267 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-12.04/Dockerfile.jinja2 b/docker/php/ubuntu-12.04/Dockerfile.jinja2 index 3cbd23ec1..03c92ad75 100644 --- a/docker/php/ubuntu-12.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-12.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-12.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 1a7e0cb04..9e5d06a45 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-14.04/Dockerfile.jinja2 b/docker/php/ubuntu-14.04/Dockerfile.jinja2 index 6a5876d83..002b201a8 100644 --- a/docker/php/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-14.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index ce76dbc61..a4f6f7a77 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-15.04/Dockerfile.jinja2 b/docker/php/ubuntu-15.04/Dockerfile.jinja2 index 647f7ee45..24d9a71be 100644 --- a/docker/php/ubuntu-15.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-15.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 809f0293c..49f3413b1 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-15.10/Dockerfile.jinja2 b/docker/php/ubuntu-15.10/Dockerfile.jinja2 index 01313c4f2..82ba14fd7 100644 --- a/docker/php/ubuntu-15.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-15.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-15.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index a82f2ad15..4fefaf98a 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-16.04/Dockerfile.jinja2 b/docker/php/ubuntu-16.04/Dockerfile.jinja2 index 81a28f909..26d991b30 100644 --- a/docker/php/ubuntu-16.04/Dockerfile.jinja2 +++ b/docker/php/ubuntu-16.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-16.04") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 4e58459ab..29b922a17 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:ubuntu-16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php ENV WEB_ALIAS_DOMAIN *.vm diff --git a/docker/php/ubuntu-16.10/Dockerfile.jinja2 b/docker/php/ubuntu-16.10/Dockerfile.jinja2 index 4934d769d..2ec2c6c3a 100644 --- a/docker/php/ubuntu-16.10/Dockerfile.jinja2 +++ b/docker/php/ubuntu-16.10/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app", "ubuntu-16.10") }} -{{ docker.version() }} - {{ environment.web() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index 6af99ead5..81eea3993 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-nginx:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/piwik/ubuntu-14.04/Dockerfile.jinja2 b/docker/piwik/ubuntu-14.04/Dockerfile.jinja2 index d9972ec91..1e3e7f636 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/piwik/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-nginx", "ubuntu-14.04") }} -{{ docker.version() }} - 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 9946622ad..4c75714d9 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - COPY conf/ /opt/docker/ RUN /opt/docker/bin/control.sh service.enable postfix \ diff --git a/docker/postfix/latest/Dockerfile.jinja2 b/docker/postfix/latest/Dockerfile.jinja2 index 8f0265caa..c5d6bafd5 100644 --- a/docker/postfix/latest/Dockerfile.jinja2 +++ b/docker/postfix/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app") }} -{{ docker.version() }} - {{ docker.copy('conf/', '/opt/docker/') }} {{ postfix.ubuntu() }} diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 527dc703c..ec94517f4 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -5,11 +5,6 @@ FROM zendesk/samson:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ############################################################################### # Bootstrap diff --git a/docker/samson-deployment/latest/Dockerfile.jinja2 b/docker/samson-deployment/latest/Dockerfile.jinja2 index c9fbb20ce..6752148b3 100644 --- a/docker/samson-deployment/latest/Dockerfile.jinja2 +++ b/docker/samson-deployment/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("samson", user="zendesk") }} -{{ docker.version() }} - ############################################################################### # Bootstrap diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index fc428a658..f3da4e287 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/bootstrap:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - RUN /usr/local/bin/apk-install \ # General python python \ diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 index 831b20ba5..2ca8927cd 100644 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ b/docker/sphinx/latest/Dockerfile.jinja2 @@ -1,5 +1,3 @@ {{ docker.from("bootstrap","alpine-3") }} -{{ docker.version() }} - {{ sphinx.alpine() }} diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 4044521d3..b8c9d8229 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base-app:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - RUN /opt/docker/bin/control.sh service.enable ssh \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile.jinja2 b/docker/ssh/latest/Dockerfile.jinja2 index 292efdb12..65b04d6be 100644 --- a/docker/ssh/latest/Dockerfile.jinja2 +++ b/docker/ssh/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base-app") }} -{{ docker.version() }} - {{ ssh.ubuntu() }} {{ docker.expose('22') }} diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index cedd850c9..f781ba889 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -5,11 +5,6 @@ FROM busybox:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/storage/latest/Dockerfile.jinja2 b/docker/storage/latest/Dockerfile.jinja2 index 3031e68e2..e23e33453 100644 --- a/docker/storage/latest/Dockerfile.jinja2 +++ b/docker/storage/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.fromOfficial("busybox") }} -{{ docker.version() }} - RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index ad8d85491..aded6725d 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/php-apache:ubuntu-14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV WEB_DOCUMENT_ROOT /app/web/ COPY conf/ /opt/docker/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile.jinja2 b/docker/typo3/ubuntu-14.04/Dockerfile.jinja2 index 3b5805449..1fc57744a 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile.jinja2 +++ b/docker/typo3/ubuntu-14.04/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("php-apache", "ubuntu-14.04") }} -{{ docker.version() }} - ENV WEB_DOCUMENT_ROOT /app/web/ {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 4dd3de6c6..ad852081c 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:alpine-3 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV VARNISH_PORT 80 ENV VARNISH_CONFIG "" diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 index 0d5a01926..23c853522 100644 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ b/docker/varnish/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base","alpine-3") }} -{{ docker.version() }} - {{ varnish.env() }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 778921412..81041a766 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -5,11 +5,6 @@ FROM webdevops/base:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - ENV FTP_USER application ENV FTP_PASSWORD application ENV FTP_UID 1000 diff --git a/docker/vsftp/latest/Dockerfile.jinja2 b/docker/vsftp/latest/Dockerfile.jinja2 index e4ff22d0b..fbf0db226 100644 --- a/docker/vsftp/latest/Dockerfile.jinja2 +++ b/docker/vsftp/latest/Dockerfile.jinja2 @@ -1,7 +1,5 @@ {{ docker.from("base", "latest") }} -{{ docker.version() }} - {{ environment.ftp() }} {{ docker.copy('conf/', '/opt/docker/') }} From 55d5aa3cff9b3b66e4d2c929b563c5ce8f9a8b19 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 22:07:23 +0200 Subject: [PATCH 28/58] Fix tests in ipv6 environments --- tests/serverspec/spec/shared/hhvm/listening.rb | 12 ++++-------- tests/serverspec/spec/shared/liquidsoap/listening.rb | 2 +- tests/serverspec/spec/shared/php/fpm.rb | 8 ++++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/serverspec/spec/shared/hhvm/listening.rb b/tests/serverspec/spec/shared/hhvm/listening.rb index 84b874e2f..ce0cd4a5f 100644 --- a/tests/serverspec/spec/shared/hhvm/listening.rb +++ b/tests/serverspec/spec/shared/hhvm/listening.rb @@ -1,21 +1,17 @@ shared_examples 'hhvm::listening::public' do describe port(9000) do it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.with('tcp') + should be_listening.on('::') or be_listening.on('0.0.0.0') end end end shared_examples 'hhvm::listening::local-only' do - describe port(9000) do - it "hhvm should NOT be listening public", :retry => 20, :retry_wait => 3 do - should_not be_listening - end - end - describe port(9000) do it "hhvm should be listening local", :retry => 20, :retry_wait => 3 do - should be_listening.on('::1').with('tcp') + should_not be_listening.on('::') + should_not be_listening.on('0.0.0.0') + should be_listening.on('::1') or be_listening.on('127.0.0.1') end end end diff --git a/tests/serverspec/spec/shared/liquidsoap/listening.rb b/tests/serverspec/spec/shared/liquidsoap/listening.rb index 1ff02588c..035b8ab1c 100644 --- a/tests/serverspec/spec/shared/liquidsoap/listening.rb +++ b/tests/serverspec/spec/shared/liquidsoap/listening.rb @@ -1,7 +1,7 @@ shared_examples 'liquidsoap::listening::public' do describe port(1234) do it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.with('tcp') + should be_listening end end end diff --git a/tests/serverspec/spec/shared/php/fpm.rb b/tests/serverspec/spec/shared/php/fpm.rb index e1605dbe1..defb41443 100644 --- a/tests/serverspec/spec/shared/php/fpm.rb +++ b/tests/serverspec/spec/shared/php/fpm.rb @@ -38,7 +38,7 @@ shared_examples 'php-fpm::listening::public' do describe port(9000) do it "php-fpm should be listening", :retry => 10, :retry_wait => 3 do - should be_listening + should be_listening.on('::') or be_listening.on('0.0.0.0') end end end @@ -46,9 +46,9 @@ shared_examples 'php-fpm::listening::local-only' do describe port(9000) do it "php-fpm should be listening local", :retry => 10, :retry_wait => 3 do - should_not be_listening.on('0.0.0.0').with('tcp') - should_not be_listening.on('::').with('tcp6') - should be_listening.on('127.0.0.1').with('tcp') + should_not be_listening.on('0.0.0.0') + should_not be_listening.on('::') + should be_listening.on('::1') or be_listening.on('127.0.0.1') end end end From b94771366d3e9f23db13cdbe61217a7072387ad3 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 22:37:53 +0200 Subject: [PATCH 29/58] Rename alpine-3 to alpine --- baselayout/usr/local/bin/service | 86 ------------------ conf/console.yml | 3 +- conf/provision.yml | 16 ++-- docker/ansible/alpine-3 | 1 + .../ansible/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 docker/apache-dev/alpine-3 | 1 + .../{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../bin/service.d/httpd.d/12-development.sh | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../webdevops-apache-dev/defaults/main.yml | 0 .../webdevops-apache-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-apache-dev/tasks/main.yml | 0 docker/apache/alpine-3 | 1 + docker/apache/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../{alpine-3 => alpine}/Dockerfile.jinja2-e | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../webdevops-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-apache/tasks/main.yml | 0 docker/base-app/alpine-3 | 1 + .../base-app/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../webdevops-base-app/defaults/main.yml | 0 .../webdevops-base-app/tasks/bootstrap.yml | 0 .../tasks/bootstrap/application.yml | 0 .../tasks/bootstrap/user.yml | 0 .../roles/webdevops-base-app/tasks/main.yml | 0 docker/base/alpine-3 | 1 + docker/base/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 docker/base/{alpine-3 => alpine}/conf/VERSION | 0 .../conf/bin/bootstrap.sh | 0 .../{alpine-3 => alpine}/conf/bin/config.sh | 0 .../{alpine-3 => alpine}/conf/bin/control.sh | 0 .../conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../conf/bin/entrypoint.d/noop.sh | 0 .../conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../conf/bin/entrypoint.sh | 0 .../{alpine-3 => alpine}/conf/bin/logwatch.sh | 0 .../{alpine-3 => alpine}/conf/bin/provision | 0 .../conf/bin/provision.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../conf/bin/service.d/ssh.sh | 0 .../bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../conf/etc/logrotate.d/syslog-ng | 0 .../conf/etc/supervisor.conf | 0 .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog-ng.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../roles/webdevops-base/defaults/main.yml | 0 .../roles/webdevops-base/tasks/bootstrap.yml | 0 .../webdevops-base/tasks/bootstrap/misc.yml | 0 .../webdevops-base/tasks/bootstrap/pam.yml | 0 .../webdevops-base/tasks/bootstrap/root.yml | 0 .../tasks/bootstrap/supervisor.yml | 0 .../tasks/bootstrap/syslog-ng.yml | 0 .../webdevops-base/tasks/bootstrap/system.yml | 0 .../roles/webdevops-base/tasks/build.yml | 0 .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 0 .../webdevops-base/tasks/entrypoint/.gitkeep | 0 .../roles/webdevops-base/tasks/main.yml | 0 .../roles/webdevops-cleanup/tasks/cleanup.yml | 0 .../roles/webdevops-cleanup/tasks/main.yml | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/variables-webdevops.yml | 0 .../conf/provision/variables.yml | 0 docker/bootstrap/alpine-3 | 1 + .../bootstrap/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../{alpine-3 => alpine}/baselayout.tar | Bin docker/nginx-dev/alpine-3 | 1 + .../nginx-dev/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../bin/service.d/nginx.d/12-development.sh | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../webdevops-nginx-dev/defaults/main.yml | 0 .../webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../tasks/bootstrap/nginx.yml | 0 .../roles/webdevops-nginx-dev/tasks/main.yml | 0 docker/nginx/alpine-3 | 1 + docker/nginx/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 0 .../vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-nginx/tasks/main.yml | 0 docker/php-apache-dev/alpine-3 | 1 + .../{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../bin/service.d/httpd.d/12-development.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../etc/supervisor.d/blackfire-agent.conf | 0 .../provision/entrypoint.d/10-php-debugger.sh | 0 .../webdevops-apache-dev/defaults/main.yml | 0 .../webdevops-apache-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-apache-dev/tasks/main.yml | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../webdevops-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-apache/tasks/main.yml | 0 .../webdevops-php-apache/defaults/main.yml | 0 .../webdevops-php-apache/tasks/bootstrap.yml | 0 .../webdevops-php-apache/tasks/entrypoint.yml | 0 .../roles/webdevops-php-apache/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../webdevops-php-dev/tasks/bootstrap.yml | 0 .../tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-apache/alpine-3 | 1 + .../{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../webdevops-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-apache/tasks/main.yml | 0 .../webdevops-php-apache/defaults/main.yml | 0 .../webdevops-php-apache/tasks/bootstrap.yml | 0 .../webdevops-php-apache/tasks/entrypoint.yml | 0 .../roles/webdevops-php-apache/tasks/main.yml | 0 docker/php-dev/alpine-3 | 1 + .../php-dev/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../etc/supervisor.d/blackfire-agent.conf | 0 .../provision/entrypoint.d/10-php-debugger.sh | 0 .../roles/webdevops-dev/defaults/main.yml | 0 .../roles/webdevops-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-dev/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../webdevops-php-dev/tasks/bootstrap.yml | 0 .../tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-nginx-dev/alpine-3 | 1 + .../{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../bin/service.d/nginx.d/12-development.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../etc/nginx/vhost.common.d/10-general.conf | 0 .../vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../etc/supervisor.d/blackfire-agent.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../provision/entrypoint.d/10-php-debugger.sh | 0 .../webdevops-nginx-dev/defaults/main.yml | 0 .../webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../tasks/bootstrap/nginx.yml | 0 .../roles/webdevops-nginx-dev/tasks/main.yml | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-nginx/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../webdevops-php-dev/tasks/bootstrap.yml | 0 .../tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 .../webdevops-php-nginx/defaults/main.yml | 0 .../webdevops-php-nginx/tasks/bootstrap.yml | 0 .../webdevops-php-nginx/tasks/entrypoint.yml | 0 .../roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php-nginx/alpine-3 | 1 + .../php-nginx/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../etc/nginx/vhost.common.d/10-general.conf | 0 .../vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-nginx/tasks/main.yml | 0 .../webdevops-php-nginx/defaults/main.yml | 0 .../webdevops-php-nginx/tasks/bootstrap.yml | 0 .../webdevops-php-nginx/tasks/entrypoint.yml | 0 .../roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php/alpine-3 | 1 + docker/php/{alpine-3 => alpine}/Dockerfile | 2 +- .../{alpine-3 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../bin/service.d/php-fpm.d/11-clear-env.sh | 0 .../conf/bin/service.d/php-fpm.sh | 0 .../conf/etc/logrotate.d/php5-fpm | 0 .../conf/etc/php/conf.d/.gitkeep | 0 .../conf/etc/php/fpm/php-fpm.conf | 0 .../conf/etc/php/fpm/pool.d/application.conf | 0 .../{alpine-3 => alpine}/conf/etc/php/php.ini | 0 .../conf/etc/php/php.webdevops.ini | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../roles/webdevops-php/defaults/main.yml | 0 .../roles/webdevops-php/tasks/bootstrap.yml | 0 .../webdevops-php/tasks/bootstrap/init.yml | 0 .../tasks/bootstrap/php-fpm.main.yml | 0 .../tasks/bootstrap/php-fpm.pool.yml | 0 .../webdevops-php/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php.alpine.yml | 0 .../tasks/bootstrap/php.debian.yml | 0 .../tasks/bootstrap/php.redhat.yml | 0 .../webdevops-php/tasks/bootstrap/php.yml | 0 .../roles/webdevops-php/tasks/main.yml | 0 358 files changed, 38 insertions(+), 109 deletions(-) delete mode 100755 baselayout/usr/local/bin/service create mode 120000 docker/ansible/alpine-3 rename docker/ansible/{alpine-3 => alpine}/Dockerfile (93%) rename docker/ansible/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) create mode 120000 docker/apache-dev/alpine-3 rename docker/apache-dev/{alpine-3 => alpine}/Dockerfile (90%) rename docker/apache-dev/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) create mode 120000 docker/apache/alpine-3 rename docker/apache/{alpine-3 => alpine}/Dockerfile (94%) rename docker/apache/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/apache/{alpine-3 => alpine}/Dockerfile.jinja2-e (100%) rename docker/apache/{alpine-3 => alpine}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/apache/{alpine-3 => alpine}/conf/bin/service.d/httpd.sh (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/global.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/main.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/php.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.crt (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.csr (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.key (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/etc/supervisor.d/apache.conf (100%) rename docker/apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) create mode 120000 docker/base-app/alpine-3 rename docker/base-app/{alpine-3 => alpine}/Dockerfile (94%) rename docker/base-app/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/roles/webdevops-base-app/defaults/main.yml (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml (100%) rename docker/base-app/{alpine-3 => alpine}/conf/provision/roles/webdevops-base-app/tasks/main.yml (100%) create mode 120000 docker/base/alpine-3 rename docker/base/{alpine-3 => alpine}/Dockerfile (96%) rename docker/base/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/base/{alpine-3 => alpine}/conf/VERSION (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/bootstrap.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/config.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/control.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.d/cli.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.d/default.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.d/noop.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.d/root.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/entrypoint.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/logwatch.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/provision (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/provision.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/cron.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/dnsmasq.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/postfix.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/ssh.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/supervisor.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/service.d/syslog-ng.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/usr-bin/docker-service-disable (100%) rename docker/base/{alpine-3 => alpine}/conf/bin/usr-bin/docker-service-enable (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/logrotate.d/syslog-ng (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/cron.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/postfix.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/ssh.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/supervisor.d/syslog-ng.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/ansible.cfg (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/build.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/build.d/10-cleanup.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/defaults/main.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/build.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/build/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/entrypoint.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-base/tasks/main.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/roles/webdevops-cleanup/tasks/main.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/service.d/.gitkeep (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/service.d/cron.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/service.d/dnsmasq.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/service.d/postfix.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/service.d/ssh.sh (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/variables-webdevops.yml (100%) rename docker/base/{alpine-3 => alpine}/conf/provision/variables.yml (100%) create mode 120000 docker/bootstrap/alpine-3 rename docker/bootstrap/{alpine-3 => alpine}/Dockerfile (97%) rename docker/bootstrap/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/bootstrap/{alpine-3 => alpine}/baselayout.tar (100%) create mode 120000 docker/nginx-dev/alpine-3 rename docker/nginx-dev/{alpine-3 => alpine}/Dockerfile (91%) rename docker/nginx-dev/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) create mode 120000 docker/nginx/alpine-3 rename docker/nginx/{alpine-3 => alpine}/Dockerfile (92%) rename docker/nginx/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/nginx/{alpine-3 => alpine}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/nginx/{alpine-3 => alpine}/conf/bin/service.d/nginx.sh (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/global.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/main.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/nginx.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/php.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.crt (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.csr (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.key (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) create mode 120000 docker/php-apache-dev/alpine-3 rename docker/php-apache-dev/{alpine-3 => alpine}/Dockerfile (94%) rename docker/php-apache-dev/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/global.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/main.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/php.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-apache-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-apache/alpine-3 rename docker/php-apache/{alpine-3 => alpine}/Dockerfile (94%) rename docker/php-apache/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/global.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/main.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/php.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) create mode 120000 docker/php-dev/alpine-3 rename docker/php-dev/{alpine-3 => alpine}/Dockerfile (93%) rename docker/php-dev/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-dev/tasks/main.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-nginx-dev/alpine-3 rename docker/php-nginx-dev/{alpine-3 => alpine}/Dockerfile (93%) rename docker/php-nginx-dev/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx-dev/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php-nginx/alpine-3 rename docker/php-nginx/{alpine-3 => alpine}/Dockerfile (92%) rename docker/php-nginx/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx/{alpine-3 => alpine}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php/alpine-3 rename docker/php/{alpine-3 => alpine}/Dockerfile (97%) rename docker/php/{alpine-3 => alpine}/Dockerfile.jinja2 (100%) rename docker/php/{alpine-3 => alpine}/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/php/{alpine-3 => alpine}/conf/bin/service.d/php-fpm.d/11-clear-env.sh (100%) rename docker/php/{alpine-3 => alpine}/conf/bin/service.d/php-fpm.sh (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/logrotate.d/php5-fpm (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/php/conf.d/.gitkeep (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/php/fpm/php-fpm.conf (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/php/fpm/pool.d/application.conf (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/php/php.ini (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/php/php.webdevops.ini (100%) rename docker/php/{alpine-3 => alpine}/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/defaults/main.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml (100%) rename docker/php/{alpine-3 => alpine}/conf/provision/roles/webdevops-php/tasks/main.yml (100%) diff --git a/baselayout/usr/local/bin/service b/baselayout/usr/local/bin/service deleted file mode 100755 index 55ea12bf7..000000000 --- a/baselayout/usr/local/bin/service +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -# Root check -if [ "$(/usr/bin/whoami)" != "root" ]; then - echo "[ERROR] Must be run as root" - exit 1 -fi - -function serviceHelp() { - echo "Usage: $(basename "$0") " -} - -function getServicePid() { - local serviceName="$1" - local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") - - if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then - echo "not running" - exit 1 - fi - - echo $servicePid -} - -# Param check -if [ "$#" -lt 2 ]; then - echo "[ERROR] Missing parameters" - serviceHelp - exit 1 -fi - -############################# -# Param init -############################# - -SERVICENAME="$1" -ACTION="$2" - -############################# -# Service aliases -############################# -case "$SERVICENAME" in - apache2|httpd) - SERVICENAME="apache" - ;; -esac - -############################# -# Action runner -############################# -case "$ACTION" in - stop|start|restart|status) - exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" - ;; - - pid) - echo $(getServicePid "${SERVICENAME}") - ;; - - check) - FIRST_PID=$(getServicePid "${SERVICENAME}") - sleep 5 - SECOND_PID=$(getServicePid "${SERVICENAME}") - - if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then - echo "ok" - exit 0 - else - echo "not running" - exit 1 - fi - ;; - - - *) - echo "[ERROR] Invalid action" - serviceHelp - exit 1 - ;; - -esac diff --git a/conf/console.yml b/conf/console.yml index 352f5d0f2..275cc4288 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -37,7 +37,7 @@ dockerTest: - 'ENV VARNISH_BACKEND_HOST webdevops.io' configuration: - imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-(?P[^-]+)' + imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-(?P[^-]+)?' default: OS_FAMILY: 'ubuntu' OS_VERSION: '16.04' @@ -45,6 +45,7 @@ dockerTest: ':centos': OS_FAMILY: 'redhat' ':alpine': + OS_VERSION: '3' PHP_REDIS: '0' ':ubuntu-12.04': PHP_REDIS: '0' diff --git a/conf/provision.yml b/conf/provision.yml index 16909724f..beb2db3c9 100644 --- a/conf/provision.yml +++ b/conf/provision.yml @@ -6,7 +6,7 @@ provision: configuration: base/general: '*' base/centos: centos-* - base/alpine: alpine-* + base/alpine: alpine base-app: configuration: base-app/general: '*' @@ -14,7 +14,7 @@ provision: configuration: apache/general : '*' apache/centos : centos-* - apache/alpine : alpine-* + apache/alpine : alpine apache-dev: configuration: apache-dev/general: '*' @@ -22,7 +22,7 @@ provision: configuration: nginx/general : '*' nginx/centos : centos-* - nginx/alpine : alpine-* + nginx/alpine : alpine nginx-dev: configuration: nginx-dev/general : '*' @@ -42,18 +42,18 @@ provision: configuration: php/general : '(debian|ubuntu|centos|alpine)' php/ubuntu-12.04 : ubuntu-12.04 - php/alpine : alpine-* + php/alpine : alpine php-apache: configuration: apache/general : '*' apache/centos : centos-* - apache/alpine : alpine-* + apache/alpine : alpine php-apache/general: '*' php-nginx: configuration: nginx/general : '*' nginx/centos : centos-* - nginx/alpine : alpine-* + nginx/alpine : alpine php-nginx/general : '*' php-dev: configuration: @@ -63,7 +63,7 @@ provision: configuration: apache/general : '*' apache/centos : centos-* - apache/alpine : alpine-* + apache/alpine : alpine php-apache/general: '*' php-dev/general : '*' apache-dev/general: '*' @@ -71,7 +71,7 @@ provision: configuration: nginx/general : '*' nginx/centos : centos-* - nginx/alpine : alpine-* + nginx/alpine : alpine php-nginx/general : '*' php-dev/general : '*' nginx-dev/general : '*' diff --git a/docker/ansible/alpine-3 b/docker/ansible/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/ansible/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine/Dockerfile similarity index 93% rename from docker/ansible/alpine-3/Dockerfile rename to docker/ansible/alpine/Dockerfile index 123cf8b21..25084dbfe 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:alpine-3 +# Dockerfile for webdevops/ansible:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/ansible/alpine-3/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/ansible/alpine-3/Dockerfile.jinja2 rename to docker/ansible/alpine/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine-3 b/docker/apache-dev/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/apache-dev/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine/Dockerfile similarity index 90% rename from docker/apache-dev/alpine-3/Dockerfile rename to docker/apache-dev/alpine/Dockerfile index 8533339b5..4ca73a703 100644 --- a/docker/apache-dev/alpine-3/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:alpine-3 +# Dockerfile for webdevops/apache-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/apache-dev/alpine-3/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/apache-dev/alpine-3/Dockerfile.jinja2 rename to docker/apache-dev/alpine/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache/alpine-3 b/docker/apache/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/apache/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine/Dockerfile similarity index 94% rename from docker/apache/alpine-3/Dockerfile rename to docker/apache/alpine/Dockerfile index 22713203a..cabc08dd1 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:alpine-3 +# Dockerfile for webdevops/apache:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/apache/alpine-3/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/apache/alpine-3/Dockerfile.jinja2 rename to docker/apache/alpine/Dockerfile.jinja2 diff --git a/docker/apache/alpine-3/Dockerfile.jinja2-e b/docker/apache/alpine/Dockerfile.jinja2-e similarity index 100% rename from docker/apache/alpine-3/Dockerfile.jinja2-e rename to docker/apache/alpine/Dockerfile.jinja2-e diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh rename to docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/alpine-3/conf/bin/service.d/httpd.sh b/docker/apache/alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/alpine-3/conf/bin/service.d/httpd.sh rename to docker/apache/alpine/conf/bin/service.d/httpd.sh diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/conf.d/.gitkeep rename to docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/conf.d/10-server.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/global.conf b/docker/apache/alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/global.conf rename to docker/apache/alpine/conf/etc/httpd/global.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/main.conf b/docker/apache/alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/main.conf rename to docker/apache/alpine/conf/etc/httpd/main.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/php.conf b/docker/apache/alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/php.conf rename to docker/apache/alpine/conf/etc/httpd/php.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/ssl/server.crt b/docker/apache/alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/ssl/server.crt rename to docker/apache/alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/alpine-3/conf/etc/httpd/ssl/server.csr b/docker/apache/alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/ssl/server.csr rename to docker/apache/alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/alpine-3/conf/etc/httpd/ssl/server.key b/docker/apache/alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/ssl/server.key rename to docker/apache/alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/alpine-3/conf/etc/httpd/vhost.common.conf b/docker/apache/alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/vhost.common.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/vhost.conf b/docker/apache/alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/vhost.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.conf diff --git a/docker/apache/alpine-3/conf/etc/httpd/vhost.ssl.conf b/docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/httpd/vhost.ssl.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/alpine-3/conf/etc/supervisor.d/apache.conf b/docker/apache/alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/alpine-3/conf/etc/supervisor.d/apache.conf rename to docker/apache/alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/apache/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/base-app/alpine-3 b/docker/base-app/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/base-app/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine/Dockerfile similarity index 94% rename from docker/base-app/alpine-3/Dockerfile rename to docker/base-app/alpine/Dockerfile index 2a9cf2441..b04b48ab9 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:alpine-3 +# Dockerfile for webdevops/base-app:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/base-app/alpine-3/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/base-app/alpine-3/Dockerfile.jinja2 rename to docker/base-app/alpine/Dockerfile.jinja2 diff --git a/docker/base-app/alpine-3/conf/provision/onbuild.d/.gitkeep b/docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base-app/alpine-3/conf/provision/onbuild.d/.gitkeep rename to docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml similarity index 100% rename from docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/defaults/main.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml similarity index 100% rename from docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml similarity index 100% rename from docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml similarity index 100% rename from docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml similarity index 100% rename from docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/main.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml diff --git a/docker/base/alpine-3 b/docker/base/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/base/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine/Dockerfile similarity index 96% rename from docker/base/alpine-3/Dockerfile rename to docker/base/alpine/Dockerfile index ea8edf989..354a20c89 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:alpine-3 +# Dockerfile for webdevops/base:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/base/alpine-3/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/base/alpine-3/Dockerfile.jinja2 rename to docker/base/alpine/Dockerfile.jinja2 diff --git a/docker/base/alpine-3/conf/VERSION b/docker/base/alpine/conf/VERSION similarity index 100% rename from docker/base/alpine-3/conf/VERSION rename to docker/base/alpine/conf/VERSION diff --git a/docker/base/alpine-3/conf/bin/bootstrap.sh b/docker/base/alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/bootstrap.sh rename to docker/base/alpine/conf/bin/bootstrap.sh diff --git a/docker/base/alpine-3/conf/bin/config.sh b/docker/base/alpine/conf/bin/config.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/config.sh rename to docker/base/alpine/conf/bin/config.sh diff --git a/docker/base/alpine-3/conf/bin/control.sh b/docker/base/alpine/conf/bin/control.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/control.sh rename to docker/base/alpine/conf/bin/control.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/cli.sh b/docker/base/alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.d/cli.sh rename to docker/base/alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/default.sh b/docker/base/alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.d/default.sh rename to docker/base/alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh b/docker/base/alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.d/noop.sh rename to docker/base/alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/root.sh b/docker/base/alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.d/root.sh rename to docker/base/alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.d/supervisord.sh b/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.d/supervisord.sh rename to docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/entrypoint.sh rename to docker/base/alpine/conf/bin/entrypoint.sh diff --git a/docker/base/alpine-3/conf/bin/logwatch.sh b/docker/base/alpine/conf/bin/logwatch.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/logwatch.sh rename to docker/base/alpine/conf/bin/logwatch.sh diff --git a/docker/base/alpine-3/conf/bin/provision b/docker/base/alpine/conf/bin/provision similarity index 100% rename from docker/base/alpine-3/conf/bin/provision rename to docker/base/alpine/conf/bin/provision diff --git a/docker/base/alpine-3/conf/bin/provision.sh b/docker/base/alpine/conf/bin/provision.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/provision.sh rename to docker/base/alpine/conf/bin/provision.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/cron.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/cron.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/cron.sh b/docker/base/alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/cron.sh rename to docker/base/alpine/conf/bin/service.d/cron.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/dnsmasq.sh b/docker/base/alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/dnsmasq.sh rename to docker/base/alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/postfix.sh b/docker/base/alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/postfix.sh rename to docker/base/alpine/conf/bin/service.d/postfix.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/ssh.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/ssh.sh b/docker/base/alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/ssh.sh rename to docker/base/alpine/conf/bin/service.d/ssh.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/supervisor.sh b/docker/base/alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/supervisor.sh rename to docker/base/alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/alpine-3/conf/bin/service.d/syslog-ng.sh b/docker/base/alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/alpine-3/conf/bin/service.d/syslog-ng.sh rename to docker/base/alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable b/docker/base/alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/alpine-3/conf/bin/usr-bin/docker-service-disable rename to docker/base/alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable b/docker/base/alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/alpine-3/conf/bin/usr-bin/docker-service-enable rename to docker/base/alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/alpine-3/conf/etc/logrotate.d/syslog-ng b/docker/base/alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/alpine-3/conf/etc/logrotate.d/syslog-ng rename to docker/base/alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/alpine-3/conf/etc/supervisor.conf b/docker/base/alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.conf rename to docker/base/alpine/conf/etc/supervisor.conf diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/.gitkeep b/docker/base/alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/.gitkeep rename to docker/base/alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/cron.conf b/docker/base/alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/cron.conf rename to docker/base/alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/postfix.conf b/docker/base/alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/postfix.conf rename to docker/base/alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/ssh.conf b/docker/base/alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/ssh.conf rename to docker/base/alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/alpine-3/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf diff --git a/docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/alpine-3/conf/etc/syslog-ng/syslog-ng.conf rename to docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/alpine-3/conf/provision/ansible.cfg b/docker/base/alpine/conf/provision/ansible.cfg similarity index 100% rename from docker/base/alpine-3/conf/provision/ansible.cfg rename to docker/base/alpine/conf/provision/ansible.cfg diff --git a/docker/base/alpine-3/conf/provision/bootstrap.d/.gitkeep b/docker/base/alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/bootstrap.d/.gitkeep rename to docker/base/alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/build.d/.gitkeep b/docker/base/alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/build.d/.gitkeep rename to docker/base/alpine/conf/provision/build.d/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/build.d/10-cleanup.sh b/docker/base/alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/build.d/10-cleanup.sh rename to docker/base/alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/alpine-3/conf/provision/entrypoint.d/.gitkeep b/docker/base/alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/entrypoint.d/.gitkeep rename to docker/base/alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/entrypoint.d/05-permissions.sh rename to docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/base/alpine-3/conf/provision/onbuild.d/.gitkeep b/docker/base/alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/onbuild.d/.gitkeep rename to docker/base/alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/defaults/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/build/.gitkeep rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/entrypoint.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml rename to docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml diff --git a/docker/base/alpine-3/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/roles/webdevops-cleanup/tasks/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml diff --git a/docker/base/alpine-3/conf/provision/service.d/.gitkeep b/docker/base/alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/alpine-3/conf/provision/service.d/.gitkeep rename to docker/base/alpine/conf/provision/service.d/.gitkeep diff --git a/docker/base/alpine-3/conf/provision/service.d/cron.sh b/docker/base/alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/service.d/cron.sh rename to docker/base/alpine/conf/provision/service.d/cron.sh diff --git a/docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/service.d/dnsmasq.sh rename to docker/base/alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/alpine-3/conf/provision/service.d/postfix.sh b/docker/base/alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/service.d/postfix.sh rename to docker/base/alpine/conf/provision/service.d/postfix.sh diff --git a/docker/base/alpine-3/conf/provision/service.d/ssh.sh b/docker/base/alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/alpine-3/conf/provision/service.d/ssh.sh rename to docker/base/alpine/conf/provision/service.d/ssh.sh diff --git a/docker/base/alpine-3/conf/provision/variables-webdevops.yml b/docker/base/alpine/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/variables-webdevops.yml rename to docker/base/alpine/conf/provision/variables-webdevops.yml diff --git a/docker/base/alpine-3/conf/provision/variables.yml b/docker/base/alpine/conf/provision/variables.yml similarity index 100% rename from docker/base/alpine-3/conf/provision/variables.yml rename to docker/base/alpine/conf/provision/variables.yml diff --git a/docker/bootstrap/alpine-3 b/docker/bootstrap/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/bootstrap/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine/Dockerfile similarity index 97% rename from docker/bootstrap/alpine-3/Dockerfile rename to docker/bootstrap/alpine/Dockerfile index 69d329cc6..4fd887527 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:alpine-3 +# Dockerfile for webdevops/bootstrap:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/bootstrap/alpine-3/Dockerfile.jinja2 b/docker/bootstrap/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/bootstrap/alpine-3/Dockerfile.jinja2 rename to docker/bootstrap/alpine/Dockerfile.jinja2 diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine/baselayout.tar similarity index 100% rename from docker/bootstrap/alpine-3/baselayout.tar rename to docker/bootstrap/alpine/baselayout.tar diff --git a/docker/nginx-dev/alpine-3 b/docker/nginx-dev/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/nginx-dev/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine/Dockerfile similarity index 91% rename from docker/nginx-dev/alpine-3/Dockerfile rename to docker/nginx-dev/alpine/Dockerfile index 474cd6566..c9031db1b 100644 --- a/docker/nginx-dev/alpine-3/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:alpine-3 +# Dockerfile for webdevops/nginx-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/nginx-dev/alpine-3/Dockerfile.jinja2 rename to docker/nginx-dev/alpine/Dockerfile.jinja2 diff --git a/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx/alpine-3 b/docker/nginx/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/nginx/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine/Dockerfile similarity index 92% rename from docker/nginx/alpine-3/Dockerfile rename to docker/nginx/alpine/Dockerfile index 38f3b04fa..ce1bb37da 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:alpine-3 +# Dockerfile for webdevops/nginx:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/nginx/alpine-3/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/nginx/alpine-3/Dockerfile.jinja2 rename to docker/nginx/alpine/Dockerfile.jinja2 diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh rename to docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/alpine-3/conf/bin/service.d/nginx.sh b/docker/nginx/alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/alpine-3/conf/bin/service.d/nginx.sh rename to docker/nginx/alpine/conf/bin/service.d/nginx.sh diff --git a/docker/nginx/alpine-3/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/conf.d/.gitkeep rename to docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf rename to docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/global.conf b/docker/nginx/alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/global.conf rename to docker/nginx/alpine/conf/etc/nginx/global.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/main.conf b/docker/nginx/alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/main.conf rename to docker/nginx/alpine/conf/etc/nginx/main.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/nginx.conf b/docker/nginx/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/nginx.conf rename to docker/nginx/alpine/conf/etc/nginx/nginx.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/php.conf b/docker/nginx/alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/php.conf rename to docker/nginx/alpine/conf/etc/nginx/php.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/ssl/server.crt b/docker/nginx/alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/ssl/server.crt rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/nginx/alpine-3/conf/etc/nginx/ssl/server.csr b/docker/nginx/alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/ssl/server.csr rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/nginx/alpine-3/conf/etc/nginx/ssl/server.key b/docker/nginx/alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/ssl/server.key rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.conf diff --git a/docker/nginx/alpine-3/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/nginx/vhost.ssl.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/nginx/alpine-3/conf/etc/supervisor.d/nginx.conf b/docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/alpine-3/conf/etc/supervisor.d/nginx.conf rename to docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3 b/docker/php-apache-dev/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php-apache-dev/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine/Dockerfile similarity index 94% rename from docker/php-apache-dev/alpine-3/Dockerfile rename to docker/php-apache-dev/alpine/Dockerfile index 8dde3dc83..8a5fe170c 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:alpine-3 +# Dockerfile for webdevops/php-apache-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 b/docker/php-apache-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php-apache-dev/alpine-3/Dockerfile.jinja2 rename to docker/php-apache-dev/alpine/Dockerfile.jinja2 diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh rename to docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/httpd.sh rename to docker/php-apache-dev/alpine/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/global.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/global.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/global.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/main.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/main.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/main.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/php.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/php.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/php.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.crt rename to docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.csr rename to docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/ssl/server.key rename to docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache-dev/alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/supervisor.d/apache.conf rename to docker/php-apache-dev/alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-apache/alpine-3 b/docker/php-apache/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php-apache/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine/Dockerfile similarity index 94% rename from docker/php-apache/alpine-3/Dockerfile rename to docker/php-apache/alpine/Dockerfile index a9e17c192..52f71259d 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:alpine-3 +# Dockerfile for webdevops/php-apache:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-apache/alpine-3/Dockerfile.jinja2 b/docker/php-apache/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php-apache/alpine-3/Dockerfile.jinja2 rename to docker/php-apache/alpine/Dockerfile.jinja2 diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache/alpine-3/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/alpine-3/conf/bin/service.d/httpd.sh b/docker/php-apache/alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/alpine-3/conf/bin/service.d/httpd.sh rename to docker/php-apache/alpine/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/global.conf b/docker/php-apache/alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/global.conf rename to docker/php-apache/alpine/conf/etc/httpd/global.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/main.conf b/docker/php-apache/alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/main.conf rename to docker/php-apache/alpine/conf/etc/httpd/main.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/php.conf b/docker/php-apache/alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/php.conf rename to docker/php-apache/alpine/conf/etc/httpd/php.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.crt b/docker/php-apache/alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.csr b/docker/php-apache/alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.key b/docker/php-apache/alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/ssl/server.key rename to docker/php-apache/alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.conf b/docker/php-apache/alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/vhost.conf b/docker/php-apache/alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/vhost.conf rename to docker/php-apache/alpine/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache/alpine-3/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache/alpine-3/conf/etc/supervisor.d/apache.conf b/docker/php-apache/alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache/alpine-3/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine-3/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-dev/alpine-3 b/docker/php-dev/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php-dev/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine/Dockerfile similarity index 93% rename from docker/php-dev/alpine-3/Dockerfile rename to docker/php-dev/alpine/Dockerfile index 9487975e3..0a7513f1f 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:alpine-3 +# Dockerfile for webdevops/php-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-dev/alpine-3/Dockerfile.jinja2 b/docker/php-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php-dev/alpine-3/Dockerfile.jinja2 rename to docker/php-dev/alpine/Dockerfile.jinja2 diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/defaults/main.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-dev/defaults/main.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-dev/tasks/main.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/main.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3 b/docker/php-nginx-dev/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php-nginx-dev/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine/Dockerfile similarity index 93% rename from docker/php-nginx-dev/alpine-3/Dockerfile rename to docker/php-nginx-dev/alpine/Dockerfile index d874fc282..448706389 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:alpine-3 +# Dockerfile for webdevops/php-nginx-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 rename to docker/php-nginx-dev/alpine/Dockerfile.jinja2 diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh rename to docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/bin/service.d/nginx.sh rename to docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/global.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/global.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/global.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/main.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/main.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/main.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/nginx.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/nginx.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/php.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/php.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/ssl/server.key rename to docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx-dev/alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine-3 b/docker/php-nginx/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php-nginx/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine/Dockerfile similarity index 92% rename from docker/php-nginx/alpine-3/Dockerfile rename to docker/php-nginx/alpine/Dockerfile index 3726bb739..16a2ebdce 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:alpine-3 +# Dockerfile for webdevops/php-nginx:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php-nginx/alpine-3/Dockerfile.jinja2 b/docker/php-nginx/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php-nginx/alpine-3/Dockerfile.jinja2 rename to docker/php-nginx/alpine/Dockerfile.jinja2 diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx/alpine-3/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx/alpine-3/conf/bin/service.d/nginx.sh b/docker/php-nginx/alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx/alpine-3/conf/bin/service.d/nginx.sh rename to docker/php-nginx/alpine/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx/alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/global.conf b/docker/php-nginx/alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/global.conf rename to docker/php-nginx/alpine/conf/etc/nginx/global.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/main.conf b/docker/php-nginx/alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/main.conf rename to docker/php-nginx/alpine/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/nginx.conf b/docker/php-nginx/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/nginx.conf rename to docker/php-nginx/alpine/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/php.conf b/docker/php-nginx/alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/php.conf rename to docker/php-nginx/alpine/conf/etc/nginx/php.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx/alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx/alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.key b/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/ssl/server.key rename to docker/php-nginx/alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/alpine/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx/alpine/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx/alpine-3/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx/alpine-3/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine-3/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php/alpine-3 b/docker/php/alpine-3 new file mode 120000 index 000000000..0120374ca --- /dev/null +++ b/docker/php/alpine-3 @@ -0,0 +1 @@ +alpine \ No newline at end of file diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine/Dockerfile similarity index 97% rename from docker/php/alpine-3/Dockerfile rename to docker/php/alpine/Dockerfile index e4b1062b4..b4f40276a 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:alpine-3 +# Dockerfile for webdevops/php:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/php/alpine-3/Dockerfile.jinja2 b/docker/php/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/php/alpine-3/Dockerfile.jinja2 rename to docker/php/alpine/Dockerfile.jinja2 diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/alpine/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php/alpine-3/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh similarity index 100% rename from docker/php/alpine-3/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php/alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php/alpine-3/conf/bin/service.d/php-fpm.sh b/docker/php/alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php/alpine-3/conf/bin/service.d/php-fpm.sh rename to docker/php/alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/php/alpine-3/conf/etc/logrotate.d/php5-fpm b/docker/php/alpine/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php/alpine-3/conf/etc/logrotate.d/php5-fpm rename to docker/php/alpine/conf/etc/logrotate.d/php5-fpm diff --git a/docker/php/alpine-3/conf/etc/php/conf.d/.gitkeep b/docker/php/alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php/alpine-3/conf/etc/php/conf.d/.gitkeep rename to docker/php/alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php/alpine-3/conf/etc/php/fpm/php-fpm.conf b/docker/php/alpine/conf/etc/php/fpm/php-fpm.conf similarity index 100% rename from docker/php/alpine-3/conf/etc/php/fpm/php-fpm.conf rename to docker/php/alpine/conf/etc/php/fpm/php-fpm.conf diff --git a/docker/php/alpine-3/conf/etc/php/fpm/pool.d/application.conf b/docker/php/alpine/conf/etc/php/fpm/pool.d/application.conf similarity index 100% rename from docker/php/alpine-3/conf/etc/php/fpm/pool.d/application.conf rename to docker/php/alpine/conf/etc/php/fpm/pool.d/application.conf diff --git a/docker/php/alpine-3/conf/etc/php/php.ini b/docker/php/alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php/alpine-3/conf/etc/php/php.ini rename to docker/php/alpine/conf/etc/php/php.ini diff --git a/docker/php/alpine-3/conf/etc/php/php.webdevops.ini b/docker/php/alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php/alpine-3/conf/etc/php/php.webdevops.ini rename to docker/php/alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/php/alpine-3/conf/etc/supervisor.d/php-fpm.conf b/docker/php/alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php/alpine-3/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/defaults/main.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/defaults/main.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/defaults/main.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml diff --git a/docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/main.yml similarity index 100% rename from docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/main.yml rename to docker/php/alpine/conf/provision/roles/webdevops-php/tasks/main.yml From e6b7e0c107eef3a6f90f2f53a389b651fdf892cc Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sun, 9 Apr 2017 23:14:12 +0200 Subject: [PATCH 30/58] Move service script from bootstrap to base --- docker/base/alpine/conf/bin/usr-bin/service | 86 +++++++++++++++++++ docker/base/centos-7/conf/bin/usr-bin/service | 86 +++++++++++++++++++ docker/base/debian-7/conf/bin/usr-bin/service | 86 +++++++++++++++++++ docker/base/debian-8/conf/bin/usr-bin/service | 86 +++++++++++++++++++ docker/base/debian-9/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-12.04/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-14.04/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-15.04/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-15.10/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-16.04/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../ubuntu-16.10/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../php-official/5.6/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../php-official/7.0/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../php-official/7.1/conf/bin/usr-bin/service | 86 +++++++++++++++++++ .../latest/conf/bin/usr-bin/service | 86 +++++++++++++++++++ provisioning/base/general/bin/usr-bin/service | 86 +++++++++++++++++++ 16 files changed, 1376 insertions(+) create mode 100755 docker/base/alpine/conf/bin/usr-bin/service create mode 100755 docker/base/centos-7/conf/bin/usr-bin/service create mode 100755 docker/base/debian-7/conf/bin/usr-bin/service create mode 100755 docker/base/debian-8/conf/bin/usr-bin/service create mode 100755 docker/base/debian-9/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-12.04/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-14.04/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-15.04/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-15.10/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-16.04/conf/bin/usr-bin/service create mode 100755 docker/base/ubuntu-16.10/conf/bin/usr-bin/service create mode 100755 docker/php-official/5.6/conf/bin/usr-bin/service create mode 100755 docker/php-official/7.0/conf/bin/usr-bin/service create mode 100755 docker/php-official/7.1/conf/bin/usr-bin/service create mode 100755 docker/samson-deployment/latest/conf/bin/usr-bin/service create mode 100755 provisioning/base/general/bin/usr-bin/service diff --git a/docker/base/alpine/conf/bin/usr-bin/service b/docker/base/alpine/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/alpine/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/centos-7/conf/bin/usr-bin/service b/docker/base/centos-7/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/centos-7/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/debian-7/conf/bin/usr-bin/service b/docker/base/debian-7/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/debian-7/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/debian-8/conf/bin/usr-bin/service b/docker/base/debian-8/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/debian-8/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/debian-9/conf/bin/usr-bin/service b/docker/base/debian-9/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/debian-9/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/service b/docker/base/ubuntu-12.04/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/service b/docker/base/ubuntu-14.04/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/service b/docker/base/ubuntu-15.04/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/service b/docker/base/ubuntu-15.10/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/service b/docker/base/ubuntu-16.04/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/service b/docker/base/ubuntu-16.10/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/5.6/conf/bin/usr-bin/service b/docker/php-official/5.6/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/7.0/conf/bin/usr-bin/service b/docker/php-official/7.0/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/php-official/7.1/conf/bin/usr-bin/service b/docker/php-official/7.1/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/service b/docker/samson-deployment/latest/conf/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac diff --git a/provisioning/base/general/bin/usr-bin/service b/provisioning/base/general/bin/usr-bin/service new file mode 100755 index 000000000..55ea12bf7 --- /dev/null +++ b/provisioning/base/general/bin/usr-bin/service @@ -0,0 +1,86 @@ +#!/bin/bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# Root check +if [ "$(/usr/bin/whoami)" != "root" ]; then + echo "[ERROR] Must be run as root" + exit 1 +fi + +function serviceHelp() { + echo "Usage: $(basename "$0") " +} + +function getServicePid() { + local serviceName="$1" + local servicePid=$(supervisorctl pid "${serviceName}:${serviceName}d") + + if [[ -z "$servicePid" ]] || [[ "$servicePid" == "0" ]]; then + echo "not running" + exit 1 + fi + + echo $servicePid +} + +# Param check +if [ "$#" -lt 2 ]; then + echo "[ERROR] Missing parameters" + serviceHelp + exit 1 +fi + +############################# +# Param init +############################# + +SERVICENAME="$1" +ACTION="$2" + +############################# +# Service aliases +############################# +case "$SERVICENAME" in + apache2|httpd) + SERVICENAME="apache" + ;; +esac + +############################# +# Action runner +############################# +case "$ACTION" in + stop|start|restart|status) + exec supervisorctl "$ACTION" "${SERVICENAME}:${SERVICENAME}d" + ;; + + pid) + echo $(getServicePid "${SERVICENAME}") + ;; + + check) + FIRST_PID=$(getServicePid "${SERVICENAME}") + sleep 5 + SECOND_PID=$(getServicePid "${SERVICENAME}") + + if [[ "$FIRST_PID" == "$SECOND_PID" ]]; then + echo "ok" + exit 0 + else + echo "not running" + exit 1 + fi + ;; + + + *) + echo "[ERROR] Invalid action" + serviceHelp + exit 1 + ;; + +esac From 3e5d02e4eb48e20c865e488c02982f8eb0bb7132 Mon Sep 17 00:00:00 2001 From: WebDevOps Bot Date: Sun, 9 Apr 2017 23:15:20 +0200 Subject: [PATCH 31/58] Update baselayout.tar --- docker/bootstrap/alpine/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/centos-7/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/debian-7/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/debian-8/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/debian-9/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-12.04/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-14.04/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-15.04/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-15.10/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-16.04/baselayout.tar | Bin 9601 -> 9100 bytes docker/bootstrap/ubuntu-16.10/baselayout.tar | Bin 9601 -> 9100 bytes docker/php-official/5.6/baselayout.tar | Bin 9601 -> 9100 bytes docker/php-official/7.0/baselayout.tar | Bin 9601 -> 9100 bytes docker/php-official/7.1/baselayout.tar | Bin 9601 -> 9100 bytes .../samson-deployment/latest/baselayout.tar | Bin 9601 -> 9100 bytes docker/typo3-solr/3.1/baselayout.tar | Bin 9601 -> 9100 bytes docker/typo3-solr/5.0/baselayout.tar | Bin 9601 -> 9100 bytes docker/typo3-solr/6.0/baselayout.tar | Bin 9601 -> 9100 bytes 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docker/bootstrap/alpine/baselayout.tar b/docker/bootstrap/alpine/baselayout.tar index 68905af7cf1a630e80bb2ca12671b637419715c9..297111d9775ff63dbdb5d8d6622c7f76e1a29b69 100644 GIT binary patch literal 9100 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 zcmV-{C4SmMT4*^jL0KkKSrydm2ml|&f3^Mm0ATO@t+m;qSm7mOJ{5@#kLg{5<%Ex zBx0BepajAu6nIhUJxpQ^CXE50WYMRogGrzO05l1Z2u%|~8lI*=Cel4Ypcw;A8fY|V z02w_aKmZ1&WTu*_`lslpsP!^50kr_gG{^t}wE*=1GynrYG&BiMNf3m@X)*}VYHUoD z@idRsJxu|SGUxh;LFxblMt}qK0w2K3==y(G)&3{a zK@eRo;!t>n^9C&=V1yEck_r=Oh=(|cOmX@jbe~K8KEGTrtL0wgR9$e|DRBq@VS$a! zdWc-AFEj8fU1gq9VX{$dFO(30v0xA*7%2qNAhCohQwXU5r9g@Wh(Hj71{P>wAwd)& zK`0^syF?I!1WIWEMFpW16%nBXX{w5t^vk6^TlGCHe0sXB zky4p#%j!oNnh_3iy`1%J5e1piX)qf>2`U^3hGPC^4LhsiKPkkWsJaD^r+<$nxzNPt zY*l2^^bLBDgP(lkQ<~{p&b~+TGN|6D=Q9ZGJ)X-E83stt7vHqVy7bwl|BnX^opRb? zx*XtYz6FY}(PQPpo7E28l%4wP*qZ3Zr$fiGu-PAp0LEp(%8|qykdcC6Trc0=QGCg5 z=gs>;4x-9c6b>Q~pn_(K2zZ{cA5Fay)IA755LI6`w%c^bCEz|=1*#VBxCK@P=rGGt zvFe2aNpIxtbeQNK<$sf8gx9WOl5dSsPBzSy`OYdL*>1#E&6*V+AnsM?`7$ZHJG?wif`{?=BSG3tGru>zqd^LEZ4m8$S$nolWLIKd| z=VKyM6)+Uq)ugy-t+lQd<67g%UV8D@sK)Eg>Av95^yrw-PgZ^RgXMUp_1}H>*87;< zXLH5d%$m;;LoJPwY4EPxc8c93{&(x!ZWtDZ+ef&9TpOO%twMGuO)- zSC1+q1YtPgccQ*8ET1WOWOux{%|uRgs~CJJql&CTjSf4 zX?(MxhAu_FCdl93pL(L{M%f^T4Z>~K>_KABC3@>^X|4ip$FpzAx6S^0zE5A? zG*sOr8b$XF@@{F6`gZ$Zo9fr9aI_izW{mHcDwpbk5cAlx9l*z7)7aATC0 zf|xO(`%mt+&+}m#(LwAJ@`7sk0Qg-I9J!DUZ&KR(2eedSKsnq9ux=>M^+ce69$1?= zB*v0AUH728VD_5+POWwT5;3S8XdT}#*!A4+xY^s1<@U4XGwidHToNrm961_Po&~p1 zK?05834-+HbR`8RP(MTgMmyR5@uVPyIGA&$Cnz?mhDAd!<5g5uRaI40RZ=CowGhmQ z(wT9IYM5)^aOO!O$t0EZszp`OM-o!1w<0R4s*1NFs;a80s;hGDRFGLBtdd9)OHIp+ zSfy&HwHj5q1LJtRlMQ*A_J4%KUxlNsQ;J3*hSQzOI;4^^h^< zJUfm2DiD@3_4{Hr)!JldoIMErY(udELC~`vj~%cMe6~f$s6^}~%OnX)Bg@JXLP$vz zk`h8lNeLk&B!rNX5<*Bx2|WEi4O3d`+f?Z>^Bq~opT&<}PW=gwKP_>URMJOIJiS-8 znkuf)+mh7@4yvZUNes~%AR9gm+w_>1GgqmR*;e@#zII*Dsj83yRzgZ-HN5iNeLxO zyDmi}hpI=rwuf~V7BaX zbhsA#!|+1tC2Q^~R2crTIH&p5%1LU&z?B7MmZ zno9T~4J1`Ok}5UwNMc8)6WZsT@zX;G$(XM>Gj^&+a`pH@6O@oZCEB&b!ew~df`wH_ zRjK!oc&0SdNL8Fg*0_cPk zd(YQ9{rl_Zrv8b)wt6dFdcf9(o~0ek2k9q~jB25D zGdh6&x6NRw!An;@Xf|kOwtP+#E~*poqG)23h^{nOVc*-Whj(|UI6is1p7S{F>2|sl zRDvtOvtHBk$}6+4$F9Bm_p0%#hfC7Sy(+BfaY-R1#n58#A`r~X!Gkb~PfyGsTT*9g z><^!dT#WQ+pffWfBr}#|OiHy;E=RM`cOwwKC`S8SDEg;KDkx(v+mFw z`6~H5ySV2m;+^+3(|1pb;=YHfIiForReR7q=VCSD`Mq!YYG9i{LLE>$?-f~-!qJY!j^nV*$msipP0|6k!>kasP;Q8WUm zS!Eafy5J}k*>`azox^vts%tU{z~-gai4@&kA>fpT{>Bj86FcKnBt<*-|9jG)Je02yp5*5Tkey8(!26g`tnoF#d={lM1-NO zy0S8YCqtW;SYK#9a48R0Z|TF;z%hhsNVG5pPy{6q6myIgVt`OlJ}L@6k3tPs)pvIh zh|v;VmZDF@UKB83qO(gtwflwrlLV?Inu5$mK$#Q4C6uQJ-H^}}9<(6R0wsR3%Ag`w zK?d%qn@YZl@^{5 z!U1~ngW{}2Fd*~&Hth_jc*YVX(>*slkmx%^`Oz&fq*;vKno$fLy|`cwgw+-E=Fo(N z-mr-V@cWQTMU)6F=@3=cYIVWa!^6K-3-L#6SoUV~G_r4+wwaRT8`kU$oaUysX7NG_ zm`Fr2B9~qeQ|X+&6yT!9GwflnQ7tvVJI)#nO_ITixQPbeSTMJoNd%?~VNMUzU|Wuh zo~!`Whpx!7=Y^{am!~#Fx?#FO#`ct^<8Kf^<#!97i3o^YSfj@kh>)1rIMYR@$T17?(Xi}_ZZ-_x#H~! z7kQqB$g@p5r9O;q`QUQ$+goWZuWMIW#uG{HTkzP^DdC>j@bkX4-;EK1G~;W%74dmw z_{pti;R+rid^t|`ye+)y@>jsYo^6x0CuQMBi*zw>8*sh#=v8cuXDZ;u=j_B%DOyP6 zjX}$)uJ?82F*O@i&b+g8*=xa*S*8-UWxXt|8_kV2v{l89d1Ca;M%V!Ck`W0+8zXDB z+&-^2GMJSDEIs(rI6EvK&*f&5S+bJrO>m#RVo(wv!T2fms!7u8)IVKjIY3R8GAbtq z2x&I)HSu+7*B31=+_}nHd~;v!+axZ&5WFB?jQ9QTbQEaIzy*eI4OX-XQ`HC*eAb=q(tV4__WKj`!s{dWfzeVt5$HlC>*W zRKpyr_FyL5zrYkl0FWD(EK(pyhgdi9TGshycjvX$o`jVw0-!ez0*M+xbq0dSgh2o) zS=O_h!I*)B{Jl~)1Qt}bt{%41%XX3+yuQEXi*+8==YTXIEGGmEz(Lj4!CWAcmO~vh z&}cGetNkX$a%v&Z<@Wp=EUP7;a6C+c zpd?HX7BQ``Q&AT4$QN8O4F2y;#rcjwuJZkJnX1qs1t)zj_x25}k|6Ma0zeL}lFJJW z=4gSU1l>^7#^ClXJ!ZohA#mJCZwb~MCQlOsohlZz-8o{=X^AObAu2-BlEd(*0hBLf z0a4cw7UC#WQD3|=IRFA!08i2YCLrH1&B4?F2@fCJ4}2%|DE&~97&*DTReJ?}3qBtq z$;0E?Ylm5TWenG~`S6v)^Oh(d0RVG^E$jTAsEx^ft7@Ote$TVf>wdK_gxjB=!Fv6_ zAyxMGdVn{2c}hQ1>H(BUL;RT08X9N~w&n5hz<4odym)CvR8?A(REn;eKHsytJ9Cg8 zL7h7`N;Gcm^r8rim@)@;&lqspuYhOlE!*Kly*cCz_912$PNDkmQQ(P4RbIypEI?Ss zZqL-Y+irWjxyuz+h)Fy}RZZo1gj@${W8fTf4L5mLODxm~31VkDX{@dmV&FvZc#rD- z&@B(zLs|qp09j3U&2Q@I&jSMpTe!vFari(meFU*880t?1D!AuOog4)_K?VxZ&p$p-O)hY49OzTLj=*5+E6oha8$$DBfZ+uvya+R(xNSh&xb(YBz_<|YsscnL;hXu&8;5*uzZ;q+n}iT2 zJ~<250Q2+Z>QE&BzG->Ugy#XdJKJ2e@08NkG20NW2?|n_gG0H9h*s?gFbIW67zf&b zAiM%m`Y?rjS4*|9Ds-LlfGxZD#pyom{{fk(lat-%mR%!MdCAn zIB+=-ga-qa2Yd^63qlS7yPjjd6QE;N?~gGu)_?^LC_p^LQ(G*e8uPS-)F8(mN z#NV5jgOKPhnoPL6(>E^%O@b!^z#yrK7$LU%aIZi)GKnEHrzdxjyn)G7W>zybquWCK zs1Vf-9`K@vxHJ!t901e^AZixtJBe@Ogz8k4Yg=Bmh%khZK(I_UbFjFaURe0Vl&?%5=AOfZ!$T`H7L9IzbFK!<-&JM82*2QFS4w%PBT{Jn=ZGg;1UV|mt%Sq1E@ z<88{#;<$@M z4gm)+0UdJVbusmEl-geuEF3b($2oxFL!sH{C1J(vG4-{*oMec?TJA8z%i>s$Mw!&XIhXKO4 zlJsjf64=${(i1^AJ7_VkHW1US5J2db5}plEx^M20WSJ{~2ygdI-k)%juUv*Pl1%3{ zVip{XYA3HY&Y1{~uI{{I#zhej)0jkccXe(;a|F8q=X2wW9emzE_?ojF->p#O?hXxE zjvPVQ0&g=&h8Tn3J32mjovakm@D{lb(+88fRDe*b*!@>>SzpSJ)yn7J$H(*1YwM+C zOB1X<)@k@=38DVi9}%zc(sJ@NlaIsSHhwE(?{B&S7$6}JlhKj3+Km7+z`8Z#<_5S7 zApw#l0Cq>*AP7~(3B-~_l1V8fiNXN_U}S+oKr0exX2bQGOvx-6&ay~JB%eKGJvH=j zfh0>P$9XgyhIXAL_|S| zc!(g9N8Q!?om@22Iyz~lnK+eK@+zvXLzegPaE;55gpkbaShnC@pVIlb?&%kFQ@f== zE&w$^V@zL!B(UHerx4&8?p0M?x2mqYbJ6<~cV^4g4VnuJoYuz)OC75gXlqbZSmv(A zXgQgjg9G%Ac4B|`bi(3e62k%F>|T;A?kup#b`=k5tT~;Vmv~+moQkqe@It(Syz-;O z?l%UfXcxn7S9f?0?YUjm-Py}!ao=20Oq!hlXo}F*AuIAR@pPAhQR-)9F^IROu`p825FCvzY`aaYNzi zCUR5P{qo7?Tv%hem z@PT?gdlvjVH8qtrzgjdfF*XJ4J!WwNEYA5>cNW;64@{8aV*`pl+;*-7|4Eq4sGq!C zFK+95LI-$FdGH8FiXGzYp+MMK0`UERlK{p9-XvNP$P^dv2dTgU zjYo|3f`Y5oJOaD2Qgrbcs-bNgjkxIRdqUPTM#@*K-KwOn`!sagA?B3Vq2p zFhHy# zq)U0ND z-OC25ZKiW@s>!MnhOSqG4*W@GxyfW}M7ry(Zg9{?n^J_M14`AFtIUPFpgcw%5RiD9 z1{*hb_oPga6N&(1p(*p@8tlvxg0+J ztyjBtKFiXr&n~;vv33aL!kTTwPM8m|N=vGAoeMya;bypk1(Ko8p1TTB(iA|?%=rGW z+++r)01q7p4S!-pG>e)WPhQEg(~8u+iRDNYFgb;abdM95ndS*)#sR1kAP&L-e1O2# zdm_dX6kDI3&T_1B58N}goWzi5G&EqVPA6vA&eCN}I!IB0iGYPd^`IhnkGrtoOZ~R( z)wJX-j+{gjcM;_YPICfd0g%95vyzXH%K2T}#h|FR5%XN5$f+ zFIBLOnB{?x@N@zlPo(sLNe=nGL5{d6rHBZD6}$k#rR*2A2+FI4r~=nF@UL)!1^dsu zE@mVjp+edMg7JmVzz#1cowb6w14V9mKJwF4L=;x3RkneyWGVz31eE8V&@|Ry^B`8H zgL&JI@W{az9SxgC)M|wo2(i$j3u#0Oc1}~FAm7>;1wE{v$c6~%F z5OO|Yo0s8_M((E2BAD6yra5jfv)*B4;9mF*OZ;benpJ&RFty&9IKlYMm2o*gOM~8Fo#E9Z+ zDr*kubM7Yxh}F2n_KD4Vw^d04qY%6l3Gv!jn(nYB^bKc8`1lm1!*x(W)dC*(njv1p zamR6~HG+n#(+MrwOQ&AAu(6aSl3!>EF+P&pqKQZ|5W0!My)*|}%H?cFSs5e+k&q-5 zkO*TCPh>13_RTlfB>Dx>h6BH8pv&+(THB}8Wh(AeYH*H36cZmz0)LZ z%uEgEl(aIqc>#4kWrMNydt>H!IzaQ6+>oc%A%&f0Cy@6B(BOQ7cxI;WUv%SiO#NJh z;{rgyA%g?kL8XF%4_C4Qrx7>W<*~SacC@3mZ}K$FW|gI)u_iLP+i;1540y+Vt`_jL;?~*W?%(< z>8oompV(u|HNffVT>Y|>Z*po!ZO<9K(*bgd=?Au~SnS9&GZ5u_Tof0KaE53~?(UN% z3Hyl|?=dkX25WLz7*k7Z`i=F*g~aYdX$8 zoc+jL3%F2GxUCm36%?RSg$)hGS0e$1%f}T9DM6>OnYIp4#0+3l!aF1)Y$n0>075V< z=OQ1PVN)bvA_Drl9n>v*1SL`q*aa*i45I+mU}dnSeZ3Jn>lDV*x9+{-C1K1GHAvJFFXIvAzdq!e z&j0~4>?AS`QzBu&Ih@S{u&7``&|j!85fy=zH$;Qxhs241KT|Ns#ySV^zTa(*!&f#! z5^f)?H5MJ4m9TE{#wA5DfgmRyD99JycTjfJv1D-;n1UYsIatC8ovPQq93U>P2GYag z5c<}pF!X>IKYQ|+2WjjBVbiq0(iAiS^!C!xVzR)~SQiaA9ZDX^{!-08@ajR$e@8Gw z%Xm}(@L5Ekx^7Kt>i#H3YtVta2XU|4Ge*t!u08b_Hk_GWTXIJ0*MrC8eE8V8@VBJJ zl??&KReFpRWY{c(J-Zn<$YvMZ%dR|a#anM2-5XV`CQ*Wp9aJ;#cBGS_FjR$_+ zMO>KF3y2UPQQQ=A4b@{rC>J1Uba~1_15k#Dq3~fb_j)Jq^(ijK){3z zNCCJI?I0DQ@}V1)&0l8fFdheO31IxjO#?9Sug`X)jA+1l(P0Z6@aJ2T@_eQq2Y7EX zyMB!xlWOuhckVmwlLNU3cDa<#mti&5)VRmOWY|Zo8m`TUbwN8wfzSfYK==@cP)pd1 zhM0)*`-B`f{lB;$BCcxy(`W~bL3oGn?oIt@K9LN>E!oPaNT%ctwv{|25Fwx@kRkU# z5IZ_fnL!qcAQKqE3W(r%RU?!Qpz%K>5%$~0hMd76Jq>xtWRK$l#7bF!Y=~@wKFV5T zl0rXrBqc3G(FojvusSfng5s7zlwgZilQN^xOG;{BkPt?pc{H_M!_Pbr-_BId>(LHA z2w?M>v1dQCW*;-o2h(6-aDZUdEHENc!zH?@Yb23weEHCBlIDS_P93Hp+z>p7FL-Jw zQ@`aSpjbEr3w-jg(PDXABW=ld zS7vCdw8U#J7Zl|I(8fr4_ai#rQrjyf4E1VgWR-hGD9E;lgr$GrFOd#DH)2=9F_96a^>#$jLs| zAV=~xi4UJ%fQH@z_M^|>c;sCf0AAq54-@k?d7+Vio>*TQ+Jq4??z^XOWk`_1_1DJN00pbV`h%Pps zcYldt7uwX-^y zq>zT9l88}z8i;rYGomjrQp;Xme={U@R|_59`Kj%rhJ~ zY}LGYhJoHSlpUNspvN?37@@9c`h>PJl<=aPl8k#gahR5mv64EVYEa*8(^NHhhJnD$ zh9R`bp*4x9X4rir;!YRw-CRruLTpGlacRH--FIuest>Ko661(ct78swEpJ%x-{bG$8W<&Zx%(^1hutDi5*LKDQP&za_K0B!?>krGMo r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?PpGH27_9Cu|Zef;1nGUG9sH08Z?1D zLrqPhYJQ~JY95K{q74{;F$Rp9KUC0Y0MkLBOn^kwNuY>W@$ZMw&fCKs_}w8UO}>28MtHr=*BNVrZw7^vIpY)Owl#9-spt2jn1s#qSp<>&xId z2qG(%xhOUf+zZKx0x5`qh)u!*^MVBV{hx2nO)Kr$h7^6ap4AjxWQOET5FoBCNJ2&h z{94Oqdo6|Xmn!*E1PvA}2*x5nHl$d{RH~wsAQUJ?0>mI7L5T}AF+zeMLV^ejxIqXo zgc!giBnc=*MMP*p8fvITR;f@{g{48Nq*0(~RcTSB5fl-jL_unr0R>fQM4%Rw1b!Ze zwC(#}zJFK0FZnj3=N6GhkD7|72|c*DQrS(>s#aW#VypbJ3R2TTg|!-5&nk^L!IhGX z7bA$XNuHhg{}k8ePqi%vU+}me5K9>K?u21gwslN3<;iDuW|nY@pEE5P0nq{ntq4Xv znP!SgE$g#wBE z)VAK&4YnPT&iEE8zfF&(HiNU3CrvxUOOq3?pBy!aVKLs}K;R|FNW?I$_wDT{zGUC> zej*2G5J$dS;@^p4{I zJEuv?p=@pg!?VNXhRvUD$o=8W{m*yOdE4f{?mLT3{lk}Z8f&F z!n|u-d8^M|_3s#yGSae;MN2X~SRWS6DLFCH=t_A?QjIb}CO(v^mg;)X5koEp$h7#E zhWsMDn_h_Fx$}ORZ;hqPHo4o3X_VS~*PCOX6HODUTW715I9GmDMhL=jwcd*Oys~_y z-6Or_ywpVJP5OJ(&GR+CWx7@KlO7b-`kg0y;W=6-j;1b%2Go_Zcscwr z6pB`IJ?jpVKKFfa_;u;lf{Zxc4&6H7_^o$j+s90{i+p<$Z7-E+^P?Jamz+GlOZhuO z2!i+xr9x)f<>+wND<@bxjg_$8Ah&+c6`fx*`1Sk(WJC~EP=x{}=$%#wSchD@WFB!L zKVga;I7D>$I~vXUw;}l87u*eaHtTG{hdIe-PC0}87Wd~g+|E|c=nmnUPA#8E^Gv9X zTo4VuJEQE5(NU2A`x*$e`BCMSNx58`FCV)NZ$~`8vkb-`g~RG-f(6{dE_L|vzIcS&Lk{jr~>Ah+(wn za*nAai%Kb6Qa2^DP51J&a6?6OMO6)$?IW}+!Qjz^>Q=q?f*5@+_kJKQ_P22PERti$ zvv3S`ZCuS2mSw(g#1PH;<;X(>eaN;5+QT8zoz!DBiG3asOfOFqe zTzNq|32%@J>yhwsgpiUFMI?lfk`h8lNeLk&B!rNX5<*X3XRlP&wb45z{yD=q_IP|) zJMv9EoOQ-kQ%M~2tVK+TiAFwA-r)N8W-S|;W@NQ=xu7_Ty75U+Un#aguA-CyU#MEs-|;yQg-oiVk6p`X^Yv3i60I9 zZVVo(4b2yLyki{U>9|Q0k_f4~V^FWSg=Z2>UzfrY+I1OTLy6Jnf5fq}<5K7gDW5e= zlQ2fKhjGU_q7IZpZh{RYRXk)=Yvqu{k7pCho^!`d3?D9HyyVTvQXE&~d(k@tf&nel z&=d+4!=m*Hs*STtx9Y0U?i!qWx{od~PEr>ly}dbg$i1tkiQgf*L~7(SGdInE&7I6e z)k#%Ul{Emns5?)7-=o!WAYjL)lK^^cs+35mt&%%bAj)!vFAi)oQj)5a6)XUb5u!FW z;GqbsA}92W({0$k{aaAf8LYT+JLx_9zp_xroFQd z%$`O%Q37|>TH-xVCDQ$KUb*$}erznAxIc>)pM}%{z$>BO+XK71;l>Z5N4v7^ zcY#s}uM*Fk3g^qsocHaruU%9+?@KQ9sk8?+XNLZR z@AKku?&V>3cCNmPyF|*XT{CBM9F82%QLS1d66IiJ_McU@fDV+slX3z*S^Je$&yug3 z&%2Ito)f<2x^C?JTZ;Q1FjmLOx)OR-_XEER$U+hIt-fc5AmfGy&5ZTEBH5)F@$PJv_Kh3 z(Fh7>7%*ahP*FX#Kz&qt>c6_~?jsSROON*^>evGKJ?}ia?UNA245g7skK*ycqZotZS#ND4hsoaL=M~;Kx1NxC>GkR%6Fn0DK zfHkP6iW$(5yDB0-oh;$Y^su+6kUxO$t05YYf#UVTjvus0S`$O~{3B11 zZXT8bU{PmK%a>HcDjAx$FJr3G+ibzjt$YH|Hx#NRcUM%z2y$0=n8vu93t!g-ZTyp` zS*J4`H2fIc76EXsu?iJ{;_Zp04L-UKRzo&yLlZ0ozdjiKPfgbU*LESaEdPEkrGyiFsmC~WoCE&8FcBrJcG z*ti{J?tLAfc@;Y|S1)hvS2XMRD2x&8v84F4are>ltgmUZRZaOTO89E-j5nsT$1MiB zM4G8YkZCC3YA}*yX(mzCv3a!TrYYaECUj@3@SiMik3j^PmX(x(Dqu8i-JXEKqkTlk z4d_Qa6zUD`u$}}Ykg06rKQlpSvpyO(Z|!H^n~ionw$fZLYgbst6G`x`_TXuh?w<^IbH26Xy%B;m(#`(hspVfOZs!Sc72M?N6)J z;o*~OAhu`4ZWBjhVeam;NvzpOaHbefK*XVt@o{LNrN>>09obklz$VKX6%(0+6CrP=Y>dpuW+z=fp=X9zYTD*+X9HGvsGz`$G|t}(HIG4Ne_N`>y^L&b20QXx zDqtv?S8D^2>YIoF7;p;tqU<#w2BZK|yGcoDpDaUU0i^O`XH!cG50PXu?%k#J0@_++ zfkk0i{iBMF~QR@dbuZ07-xe+W;ugD;oyYn%n>sC%gHR(vQ;*-9=0t zj&BuS;a_6Uhs5OJ@!D&LS$ky+*O${JaQZ5o2j_?#7(%X}%d7)hS%Rz+{kmB7ysKOW zOSiJlzAkW_R_&>$$9+GW_l+c?kNQf9Q6msD*#ngx)2kq=imOtJkyZHe`F#6TW{T$h z-d}k1d|uC1;*DGcdX3s7-J8WYeF)L0g5Jg4M_JK6N{NZ6>_wN3GY>w$UY1}iYY1uU zXW2iph+eCHSHP1qB&6>MTof{(2xZT>eKnE7Ax@UHM1wOVr0)n;P|AQIjr_m^f%+g| zgbEgR%%9oMjs^x0w^J8w$KL?J`}~S(zC)oDgaZH**kXRmmlJA1I;dfZ?m9GJFYQ7A zagI<^Ac0WNr2}+7c?<2t?yGj}t6_PCukAEfH>OrVEOR-83QeoMY3*iAe!#jiMtlZx zSfwW^Nb0C{9hODnuCEoXWXC}?WJr=3guTqwT9llnBdVd)UdXxv=|`FzDB>I-9bs!b zEH2I}@#J5UkDC3c;@be<`}P;8^-_vC6WMo z@Z&HOCWxYrg?OjIfp_tR&L;fayc~x?bkb$zD^i6fi^gjPFoSu@ag7>uY2MU5N-7#^ z{OP8dbjarH%&cZ>N0|%pK!&Jr_KGNZ4#553Jb=^#jx`0g9TGKj@hT{as99VM7&;w(uUH)HwU`m>k}y;clTMuZXCIIZrf+NbM|>1x02cCo%Tna zXw{Hjs?Igoh>cNbC3~o`fqYyp49#ab+D|?EvA-p!5yd@En;E08iPjq%9lL-snF&zZ zSyXmxKW}|qyKJg;q(K!X`#ALM&NNjj6%s~C3dY2;Nm~QOL%W@WDE3D-mW84Q(1UOR zAvB4*(%@is%lFC%5TlPxIB1$UN9PLNC?Xncgf_itCz>&=<`t_7)k6EG`Gz&9F-q95 ztvV>oFfb4o%3{(s*9w4lBzVNObYsiZr|Q|qeC1%Pcva=YS7}zpI9Mv!)#cI?V4aTo z3~P;qHuu2<4%D$kuCyyn{n9LxB^$iv--qN$*Uur0WRp3~aH7MJjYRe4+0!8r)!o;4 zv5`bXH0BW~ z7YT=6uk&>BxH}FvxzpLj&^~bG495Za2Ru5&hS8`!qy8ijH`XM(Gcze9l2bD>mna~( zHijb*UNh6bH*V>dd6|-`=!k+MA|t5OABkVH!UT~lqmIg}1MJ)3dnPQ6%fEFUI4Y~i zQAZ)Tq&XD=@zb-GF^pniO?q?Jbwou~B$ZWFQmTroLP;HapO+>(TCDc9twse^{EDip zkmbGl_(tW(OS={}+w3{({$BO+l4BPpFA_{+aB>5zJM}&2LQ4(-+Hnp6uH{u#+j^?& zw>=-oo4Rd&ZE?$S!0L9s4zqUywPMW;Y6^=S)!5AkGc%B2Jwc*|PyNXl&5@ZbFdiKj zvPGT6mKhF(L&~f$FNcjZlFxR}vVo z{N2CAt_Waun1{Z8P2s%sBv9@{^mrCK#QFD@cTElL&fk9yx*0SD?pzSV`Q@?l#*t36TO=V4P%o-RNng#4V(>MVJXMC$WqijqN++GIc ze146qfq&e3jLM1mONH&$-a!Mk1E*s16JVfWW4Sm?u=sh>`i6k}_UF|dm|`A=yv#XX@G`;LA=rhZx)ea85Op?ybEGnc+@?ie7sy@CpKjI} znP71Dm*;PF!_hn4whwv4^a~(SvrcEQckRGV>F)@Rni_?7KmmxT0>JY3?F-N*kdag) za40Y44|h-txCeE)0)oWp;G^;T1DT+wNapl#6cza0*^(QBxW6MySck&z4SOJSp-$C> zIh1tgSpoPEx2~ElJ#~a3LPm%W_!%Ld=G?k?h0HF94W9rSn4T* zl#pQ&10m8SKnh6o1ndQ@5-qL52D_L?FrdIN#{#mL1xECcr(z62O z7TK~^*~%7&1adP!zXeOPd!S$vtqzc-aKRIU+jEm=A)|LJ8mYFK&BCiDs6>sa>3OZ{ ztYwA;ijFX|*yU}Qkenk)1isqS8&k9%BM%5jJWYXy`7Q>9ji&>J_NL_uDIO0BAJ+!L z+=~ADKc#la3JYGQbKre&`rhXgUP($$XD$4%e})p-Lnk0_d*bJrZY#(!MFsKo*e}^9 zpmZIGK@?k_z~KUb^YrfL0JymwpDy;R^X0EqaeMJn<{1N{6yMK4Iz#7s*LAOJmVqI@ z&2R(@B|<&gl#2)$`JYGa4W{rrTov%zIBW0-hS<5Gxb@|-(}>iyiQ`BWFggW_cE^d( zO!EY?;{ebTC3z8Y0_L^P&t7t@au3E;IiVoXWXlCwaXR(Jb(1P#(n5?3Oav+ytw9sO zJ-kiizsB7(+;JDLB@o}leIZkvz?j@J3bAKV+AcMkN^f9Mv>YzrDJp_EIfCF`j%ZqJ zv>knoT0m)IPQviwZUZ^H9D6LYfZ3A40L=vnPR=wOn+o^-lfm$>i z4!H0Pj1hJ0IC30sfEQp)PAVX{)QTQft6ZSz@C*Xya6_~_!%^HD(u2p2!vM4d>9y$&zivuVpfJaac#pz{Zo13gv@q$+}1EkKZwoPN;@1RRg3 zGjjVe>fO<_2&dTu3TzO@G_8cjEU-2`)5>v}IOb2?nSlZDJdB5#mODhK**u^y5y8KPVQCgb^93F;X8_nL=b z)@FJR!WjW?gb#<)5~ir#gSjxt*a|vG8%Eaio(Ja`6kr=;hiIJWn6j9j#5u2B^-@6k zn1$e=Pk!RO*L{IF0BUy6yTGI_8|s1%kRj;w5G&YkIPWxGz@f7G1}Sf)$9gbeR0$U2 zV{=Nf&LKbsaw^agC8}r-3d-edM^Z9K10x_vDI&&dA?t-eKCyre1R1Syw#YFfm;g-9 z{loQw#^{;)xe3MshCwq(dEj+eKuYshVh2}B31V15gi;bwzRi#< zDX1Nx+&4J|gJFR3))HnNftpYrn|_Vy?gGsm3J%nE2Y@qJv=%8#RRno2)VxL0LmZJo zco#n4o)*CX!6b+TB!tMo53MuW%V+R8WVbtg_0QWWH+LrRcU<;P4%`LGE4B|xv167& zk_UaaTof0KaE88mK+y5%OG?3B zkprws{9}MX3_gh`feqk=U_d+JAnw>wK>VSAT)Oj!z47iog@NOh)0)wl2B5VYL9~sD zV*r}n2^l1Ph0gZ@#kaTbjUQZ12S6DRCvapQrBh&qdXR1I)5g^!_H^oIxwp8|)# zA@|m7Vd(%aeqX>~9>6p@axQa)4FG-KRJ2&Eur_D~!)F7$q2nL0vrnLR5OZJA%s}Vj z5a%ot>ljk-`n|XYYmr>GxlB97@M>(ToqW_`$nR@29&o8=<>BM>TQc?WmX@KT0Gcbb zP$eaZ?{CS>ba4nyVbPoulxtlGRGc*8!iV0FH>Yo(5&1s9BqjfJDjkm5@+T-l7cxUf zU~NJ?hgTsC0X*K~3Rox%cgM7jMb})&>Si1NAy47yJ81K{qUwg)HUQB;233HV96&li z0?&q(3pKA1*lV`(gHtW25Wt2ym{m6U{wyypWeBu1ykkMzyF#v2@&eTWprB5mo821` zDFRFY#>w;)f(D@t5ku95RaN)`{q4Bj-Pj@y0|zKgN(+!EGAIK;fy|^#Pq_%kPloy~ zJ%?Hn!Td(82{7@mzmu7tlLwbrj^Udw(O;gb?fm?1&$z0xuq1vVtuXU3QE_o zE1~l=51+CQcoWpuNeqGe;8=-EFb$CnktfqbM3P8H>%@emsGDMZv#SrMc3|C{bG025 zT~5k}286C!D43b16DA092c)cES41S070fuLp0gG#<@8yH)b^qA?+oA&Gg4J1MJZvD z-Bh)bNVh(&bQ`3(v@}zPLlEr<9z++oG$>QM<0G^z9f1P^0B|4&e+fFD*DfAUQQjNM zSKE<_8)yf790P;c(Y+`_xkAUv;TvvCy1O$)U8W;hZzb7;0%BhRkB1;_oyIRLKI?oS-xblu??^nrufML);;=zC$nzCLUG|mh6s}r|UShbU-)xOwsEa6a^># z$jLtLAV=@E(4N0|K-s_^fb;Y`JPU&&gWMRtABDy8Lt&rr)|)x8AzucY#Lp4X3UHbd zq~o3V0|77;fW!k|XNxeBxSQXOB8sPMkj2n>^NR79vqIEXqeRl{LXmK*HtIsqsA>#E z#<125N5C;mf)8+4X4SX}cmZ%-=?IUqzzr>=iNYq>5CMiI)0Q~V*ncUIIT+|u|JYpn z&Be74K!LR2V~v8O7VGrHM}XgjzILEa6b||<{KjqPvd3@ISPds#ID?^nw8GRakw4G+#OR$ z)?2fqTR>YjE^5^WOha)>H?GmYBXB-vcZgn*jHTdp17N-e$Ut$0W<#ju+FR>$j2s~9 z3+*%m?F9wu8LQ#y1%tPjqlkJ7p{$BvP;3Jw#WMi(NKiXNe^$)!Fi9Z@kcNfqW<$g} z9jZM6OD~tF)?^OK;bXhpiQ0ep16QAC1`vugXrO@w?ra*4eK&08J)yijP36a@Pq;RN zL82S%520KdkD3y&Fw?WUt?WxP4#u1S9oKfd%Aox>DGQDvLXC_%goHf2Z)Lexmhk7#*he_JI^x4 zE4|t>JtC literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 zcmV-{C4SmMT4*^jL0KkKSrydm2ml|&f3^Mm0ATO@t+m;qSm7mOJ{5@#kLg{5<%Ex zBx0BepajAu6nIhUJxpQ^CXE50WYMRogGrzO05l1Z2u%|~8lI*=Cel4Ypcw;A8fY|V z02w_aKmZ1&WTu*_`lslpsP!^50kr_gG{^t}wE*=1GynrYG&BiMNf3m@X)*}VYHUoD z@idRsJxu|SGUxh;LFxblMt}qK0w2K3==y(G)&3{a zK@eRo;!t>n^9C&=V1yEck_r=Oh=(|cOmX@jbe~K8KEGTrtL0wgR9$e|DRBq@VS$a! zdWc-AFEj8fU1gq9VX{$dFO(30v0xA*7%2qNAhCohQwXU5r9g@Wh(Hj71{P>wAwd)& zK`0^syF?I!1WIWEMFpW16%nBXX{w5t^vk6^TlGCHe0sXB zky4p#%j!oNnh_3iy`1%J5e1piX)qf>2`U^3hGPC^4LhsiKPkkWsJaD^r+<$nxzNPt zY*l2^^bLBDgP(lkQ<~{p&b~+TGN|6D=Q9ZGJ)X-E83stt7vHqVy7bwl|BnX^opRb? zx*XtYz6FY}(PQPpo7E28l%4wP*qZ3Zr$fiGu-PAp0LEp(%8|qykdcC6Trc0=QGCg5 z=gs>;4x-9c6b>Q~pn_(K2zZ{cA5Fay)IA755LI6`w%c^bCEz|=1*#VBxCK@P=rGGt zvFe2aNpIxtbeQNK<$sf8gx9WOl5dSsPBzSy`OYdL*>1#E&6*V+AnsM?`7$ZHJG?wif`{?=BSG3tGru>zqd^LEZ4m8$S$nolWLIKd| z=VKyM6)+Uq)ugy-t+lQd<67g%UV8D@sK)Eg>Av95^yrw-PgZ^RgXMUp_1}H>*87;< zXLH5d%$m;;LoJPwY4EPxc8c93{&(x!ZWtDZ+ef&9TpOO%twMGuO)- zSC1+q1YtPgccQ*8ET1WOWOux{%|uRgs~CJJql&CTjSf4 zX?(MxhAu_FCdl93pL(L{M%f^T4Z>~K>_KABC3@>^X|4ip$FpzAx6S^0zE5A? zG*sOr8b$XF@@{F6`gZ$Zo9fr9aI_izW{mHcDwpbk5cAlx9l*z7)7aATC0 zf|xO(`%mt+&+}m#(LwAJ@`7sk0Qg-I9J!DUZ&KR(2eedSKsnq9ux=>M^+ce69$1?= zB*v0AUH728VD_5+POWwT5;3S8XdT}#*!A4+xY^s1<@U4XGwidHToNrm961_Po&~p1 zK?05834-+HbR`8RP(MTgMmyR5@uVPyIGA&$Cnz?mhDAd!<5g5uRaI40RZ=CowGhmQ z(wT9IYM5)^aOO!O$t0EZszp`OM-o!1w<0R4s*1NFs;a80s;hGDRFGLBtdd9)OHIp+ zSfy&HwHj5q1LJtRlMQ*A_J4%KUxlNsQ;J3*hSQzOI;4^^h^< zJUfm2DiD@3_4{Hr)!JldoIMErY(udELC~`vj~%cMe6~f$s6^}~%OnX)Bg@JXLP$vz zk`h8lNeLk&B!rNX5<*Bx2|WEi4O3d`+f?Z>^Bq~opT&<}PW=gwKP_>URMJOIJiS-8 znkuf)+mh7@4yvZUNes~%AR9gm+w_>1GgqmR*;e@#zII*Dsj83yRzgZ-HN5iNeLxO zyDmi}hpI=rwuf~V7BaX zbhsA#!|+1tC2Q^~R2crTIH&p5%1LU&z?B7MmZ zno9T~4J1`Ok}5UwNMc8)6WZsT@zX;G$(XM>Gj^&+a`pH@6O@oZCEB&b!ew~df`wH_ zRjK!oc&0SdNL8Fg*0_cPk zd(YQ9{rl_Zrv8b)wt6dFdcf9(o~0ek2k9q~jB25D zGdh6&x6NRw!An;@Xf|kOwtP+#E~*poqG)23h^{nOVc*-Whj(|UI6is1p7S{F>2|sl zRDvtOvtHBk$}6+4$F9Bm_p0%#hfC7Sy(+BfaY-R1#n58#A`r~X!Gkb~PfyGsTT*9g z><^!dT#WQ+pffWfBr}#|OiHy;E=RM`cOwwKC`S8SDEg;KDkx(v+mFw z`6~H5ySV2m;+^+3(|1pb;=YHfIiForReR7q=VCSD`Mq!YYG9i{LLE>$?-f~-!qJY!j^nV*$msipP0|6k!>kasP;Q8WUm zS!Eafy5J}k*>`azox^vts%tU{z~-gai4@&kA>fpT{>Bj86FcKnBt<*-|9jG)Je02yp5*5Tkey8(!26g`tnoF#d={lM1-NO zy0S8YCqtW;SYK#9a48R0Z|TF;z%hhsNVG5pPy{6q6myIgVt`OlJ}L@6k3tPs)pvIh zh|v;VmZDF@UKB83qO(gtwflwrlLV?Inu5$mK$#Q4C6uQJ-H^}}9<(6R0wsR3%Ag`w zK?d%qn@YZl@^{5 z!U1~ngW{}2Fd*~&Hth_jc*YVX(>*slkmx%^`Oz&fq*;vKno$fLy|`cwgw+-E=Fo(N z-mr-V@cWQTMU)6F=@3=cYIVWa!^6K-3-L#6SoUV~G_r4+wwaRT8`kU$oaUysX7NG_ zm`Fr2B9~qeQ|X+&6yT!9GwflnQ7tvVJI)#nO_ITixQPbeSTMJoNd%?~VNMUzU|Wuh zo~!`Whpx!7=Y^{am!~#Fx?#FO#`ct^<8Kf^<#!97i3o^YSfj@kh>)1rIMYR@$T17?(Xi}_ZZ-_x#H~! z7kQqB$g@p5r9O;q`QUQ$+goWZuWMIW#uG{HTkzP^DdC>j@bkX4-;EK1G~;W%74dmw z_{pti;R+rid^t|`ye+)y@>jsYo^6x0CuQMBi*zw>8*sh#=v8cuXDZ;u=j_B%DOyP6 zjX}$)uJ?82F*O@i&b+g8*=xa*S*8-UWxXt|8_kV2v{l89d1Ca;M%V!Ck`W0+8zXDB z+&-^2GMJSDEIs(rI6EvK&*f&5S+bJrO>m#RVo(wv!T2fms!7u8)IVKjIY3R8GAbtq z2x&I)HSu+7*B31=+_}nHd~;v!+axZ&5WFB?jQ9QTbQEaIzy*eI4OX-XQ`HC*eAb=q(tV4__WKj`!s{dWfzeVt5$HlC>*W zRKpyr_FyL5zrYkl0FWD(EK(pyhgdi9TGshycjvX$o`jVw0-!ez0*M+xbq0dSgh2o) zS=O_h!I*)B{Jl~)1Qt}bt{%41%XX3+yuQEXi*+8==YTXIEGGmEz(Lj4!CWAcmO~vh z&}cGetNkX$a%v&Z<@Wp=EUP7;a6C+c zpd?HX7BQ``Q&AT4$QN8O4F2y;#rcjwuJZkJnX1qs1t)zj_x25}k|6Ma0zeL}lFJJW z=4gSU1l>^7#^ClXJ!ZohA#mJCZwb~MCQlOsohlZz-8o{=X^AObAu2-BlEd(*0hBLf z0a4cw7UC#WQD3|=IRFA!08i2YCLrH1&B4?F2@fCJ4}2%|DE&~97&*DTReJ?}3qBtq z$;0E?Ylm5TWenG~`S6v)^Oh(d0RVG^E$jTAsEx^ft7@Ote$TVf>wdK_gxjB=!Fv6_ zAyxMGdVn{2c}hQ1>H(BUL;RT08X9N~w&n5hz<4odym)CvR8?A(REn;eKHsytJ9Cg8 zL7h7`N;Gcm^r8rim@)@;&lqspuYhOlE!*Kly*cCz_912$PNDkmQQ(P4RbIypEI?Ss zZqL-Y+irWjxyuz+h)Fy}RZZo1gj@${W8fTf4L5mLODxm~31VkDX{@dmV&FvZc#rD- z&@B(zLs|qp09j3U&2Q@I&jSMpTe!vFari(meFU*880t?1D!AuOog4)_K?VxZ&p$p-O)hY49OzTLj=*5+E6oha8$$DBfZ+uvya+R(xNSh&xb(YBz_<|YsscnL;hXu&8;5*uzZ;q+n}iT2 zJ~<250Q2+Z>QE&BzG->Ugy#XdJKJ2e@08NkG20NW2?|n_gG0H9h*s?gFbIW67zf&b zAiM%m`Y?rjS4*|9Ds-LlfGxZD#pyom{{fk(lat-%mR%!MdCAn zIB+=-ga-qa2Yd^63qlS7yPjjd6QE;N?~gGu)_?^LC_p^LQ(G*e8uPS-)F8(mN z#NV5jgOKPhnoPL6(>E^%O@b!^z#yrK7$LU%aIZi)GKnEHrzdxjyn)G7W>zybquWCK zs1Vf-9`K@vxHJ!t901e^AZixtJBe@Ogz8k4Yg=Bmh%khZK(I_UbFjFaURe0Vl&?%5=AOfZ!$T`H7L9IzbFK!<-&JM82*2QFS4w%PBT{Jn=ZGg;1UV|mt%Sq1E@ z<88{#;<$@M z4gm)+0UdJVbusmEl-geuEF3b($2oxFL!sH{C1J(vG4-{*oMec?TJA8z%i>s$Mw!&XIhXKO4 zlJsjf64=${(i1^AJ7_VkHW1US5J2db5}plEx^M20WSJ{~2ygdI-k)%juUv*Pl1%3{ zVip{XYA3HY&Y1{~uI{{I#zhej)0jkccXe(;a|F8q=X2wW9emzE_?ojF->p#O?hXxE zjvPVQ0&g=&h8Tn3J32mjovakm@D{lb(+88fRDe*b*!@>>SzpSJ)yn7J$H(*1YwM+C zOB1X<)@k@=38DVi9}%zc(sJ@NlaIsSHhwE(?{B&S7$6}JlhKj3+Km7+z`8Z#<_5S7 zApw#l0Cq>*AP7~(3B-~_l1V8fiNXN_U}S+oKr0exX2bQGOvx-6&ay~JB%eKGJvH=j zfh0>P$9XgyhIXAL_|S| zc!(g9N8Q!?om@22Iyz~lnK+eK@+zvXLzegPaE;55gpkbaShnC@pVIlb?&%kFQ@f== zE&w$^V@zL!B(UHerx4&8?p0M?x2mqYbJ6<~cV^4g4VnuJoYuz)OC75gXlqbZSmv(A zXgQgjg9G%Ac4B|`bi(3e62k%F>|T;A?kup#b`=k5tT~;Vmv~+moQkqe@It(Syz-;O z?l%UfXcxn7S9f?0?YUjm-Py}!ao=20Oq!hlXo}F*AuIAR@pPAhQR-)9F^IROu`p825FCvzY`aaYNzi zCUR5P{qo7?Tv%hem z@PT?gdlvjVH8qtrzgjdfF*XJ4J!WwNEYA5>cNW;64@{8aV*`pl+;*-7|4Eq4sGq!C zFK+95LI-$FdGH8FiXGzYp+MMK0`UERlK{p9-XvNP$P^dv2dTgU zjYo|3f`Y5oJOaD2Qgrbcs-bNgjkxIRdqUPTM#@*K-KwOn`!sagA?B3Vq2p zFhHy# zq)U0ND z-OC25ZKiW@s>!MnhOSqG4*W@GxyfW}M7ry(Zg9{?n^J_M14`AFtIUPFpgcw%5RiD9 z1{*hb_oPga6N&(1p(*p@8tlvxg0+J ztyjBtKFiXr&n~;vv33aL!kTTwPM8m|N=vGAoeMya;bypk1(Ko8p1TTB(iA|?%=rGW z+++r)01q7p4S!-pG>e)WPhQEg(~8u+iRDNYFgb;abdM95ndS*)#sR1kAP&L-e1O2# zdm_dX6kDI3&T_1B58N}goWzi5G&EqVPA6vA&eCN}I!IB0iGYPd^`IhnkGrtoOZ~R( z)wJX-j+{gjcM;_YPICfd0g%95vyzXH%K2T}#h|FR5%XN5$f+ zFIBLOnB{?x@N@zlPo(sLNe=nGL5{d6rHBZD6}$k#rR*2A2+FI4r~=nF@UL)!1^dsu zE@mVjp+edMg7JmVzz#1cowb6w14V9mKJwF4L=;x3RkneyWGVz31eE8V&@|Ry^B`8H zgL&JI@W{az9SxgC)M|wo2(i$j3u#0Oc1}~FAm7>;1wE{v$c6~%F z5OO|Yo0s8_M((E2BAD6yra5jfv)*B4;9mF*OZ;benpJ&RFty&9IKlYMm2o*gOM~8Fo#E9Z+ zDr*kubM7Yxh}F2n_KD4Vw^d04qY%6l3Gv!jn(nYB^bKc8`1lm1!*x(W)dC*(njv1p zamR6~HG+n#(+MrwOQ&AAu(6aSl3!>EF+P&pqKQZ|5W0!My)*|}%H?cFSs5e+k&q-5 zkO*TCPh>13_RTlfB>Dx>h6BH8pv&+(THB}8Wh(AeYH*H36cZmz0)LZ z%uEgEl(aIqc>#4kWrMNydt>H!IzaQ6+>oc%A%&f0Cy@6B(BOQ7cxI;WUv%SiO#NJh z;{rgyA%g?kL8XF%4_C4Qrx7>W<*~SacC@3mZ}K$FW|gI)u_iLP+i;1540y+Vt`_jL;?~*W?%(< z>8oompV(u|HNffVT>Y|>Z*po!ZO<9K(*bgd=?Au~SnS9&GZ5u_Tof0KaE53~?(UN% z3Hyl|?=dkX25WLz7*k7Z`i=F*g~aYdX$8 zoc+jL3%F2GxUCm36%?RSg$)hGS0e$1%f}T9DM6>OnYIp4#0+3l!aF1)Y$n0>075V< z=OQ1PVN)bvA_Drl9n>v*1SL`q*aa*i45I+mU}dnSeZ3Jn>lDV*x9+{-C1K1GHAvJFFXIvAzdq!e z&j0~4>?AS`QzBu&Ih@S{u&7``&|j!85fy=zH$;Qxhs241KT|Ns#ySV^zTa(*!&f#! z5^f)?H5MJ4m9TE{#wA5DfgmRyD99JycTjfJv1D-;n1UYsIatC8ovPQq93U>P2GYag z5c<}pF!X>IKYQ|+2WjjBVbiq0(iAiS^!C!xVzR)~SQiaA9ZDX^{!-08@ajR$e@8Gw z%Xm}(@L5Ekx^7Kt>i#H3YtVta2XU|4Ge*t!u08b_Hk_GWTXIJ0*MrC8eE8V8@VBJJ zl??&KReFpRWY{c(J-Zn<$YvMZ%dR|a#anM2-5XV`CQ*Wp9aJ;#cBGS_FjR$_+ zMO>KF3y2UPQQQ=A4b@{rC>J1Uba~1_15k#Dq3~fb_j)Jq^(ijK){3z zNCCJI?I0DQ@}V1)&0l8fFdheO31IxjO#?9Sug`X)jA+1l(P0Z6@aJ2T@_eQq2Y7EX zyMB!xlWOuhckVmwlLNU3cDa<#mti&5)VRmOWY|Zo8m`TUbwN8wfzSfYK==@cP)pd1 zhM0)*`-B`f{lB;$BCcxy(`W~bL3oGn?oIt@K9LN>E!oPaNT%ctwv{|25Fwx@kRkU# z5IZ_fnL!qcAQKqE3W(r%RU?!Qpz%K>5%$~0hMd76Jq>xtWRK$l#7bF!Y=~@wKFV5T zl0rXrBqc3G(FojvusSfng5s7zlwgZilQN^xOG;{BkPt?pc{H_M!_Pbr-_BId>(LHA z2w?M>v1dQCW*;-o2h(6-aDZUdEHENc!zH?@Yb23weEHCBlIDS_P93Hp+z>p7FL-Jw zQ@`aSpjbEr3w-jg(PDXABW=ld zS7vCdw8U#J7Zl|I(8fr4_ai#rQrjyf4E1VgWR-hGD9E;lgr$GrFOd#DH)2=9F_96a^>#$jLs| zAV=~xi4UJ%fQH@z_M^|>c;sCf0AAq54-@k?d7+Vio>*TQ+Jq4??z^XOWk`_1_1DJN00pbV`h%Pps zcYldt7uwX-^y zq>zT9l88}z8i;rYGomjrQp;Xme={U@R|_59`Kj%rhJ~ zY}LGYhJoHSlpUNspvN?37@@9c`h>PJl<=aPl8k#gahR5mv64EVYEa*8(^NHhhJnD$ zh9R`bp*4x9X4rir;!YRw-CRruLTpGlacRH--FIuest>Ko661(ct78swEpJ%x-{bG$8W<&Zx%(^1hutDi5*LKDQP&za_K0B!?>krGMo r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?PpGH27_9Cu|Zef;1nGUG9sH08Z?1D zLrqPhYJQ~JY95K{q74{;F$Rp9KUC0Y0MkLBOn^kwNuY>W@$ZMw&fCKs_}w8UO}>28MtHr=*BNVrZw7^vIpY)Owl#9-spt2jn1s#qSp<>&xId z2qG(%xhOUf+zZKx0x5`qh)u!*^MVBV{hx2nO)Kr$h7^6ap4AjxWQOET5FoBCNJ2&h z{94Oqdo6|Xmn!*E1PvA}2*x5nHl$d{RH~wsAQUJ?0>mI7L5T}AF+zeMLV^ejxIqXo zgc!giBnc=*MMP*p8fvITR;f@{g{48Nq*0(~RcTSB5fl-jL_unr0R>fQM4%Rw1b!Ze zwC(#}zJFK0FZnj3=N6GhkD7|72|c*DQrS(>s#aW#VypbJ3R2TTg|!-5&nk^L!IhGX z7bA$XNuHhg{}k8ePqi%vU+}me5K9>K?u21gwslN3<;iDuW|nY@pEE5P0nq{ntq4Xv znP!SgE$g#wBE z)VAK&4YnPT&iEE8zfF&(HiNU3CrvxUOOq3?pBy!aVKLs}K;R|FNW?I$_wDT{zGUC> zej*2G5J$dS;@^p4{I zJEuv?p=@pg!?VNXhRvUD$o=8W{m*yOdE4f{?mLT3{lk}Z8f&F z!n|u-d8^M|_3s#yGSae;MN2X~SRWS6DLFCH=t_A?QjIb}CO(v^mg;)X5koEp$h7#E zhWsMDn_h_Fx$}ORZ;hqPHo4o3X_VS~*PCOX6HODUTW715I9GmDMhL=jwcd*Oys~_y z-6Or_ywpVJP5OJ(&GR+CWx7@KlO7b-`kg0y;W=6-j;1b%2Go_Zcscwr z6pB`IJ?jpVKKFfa_;u;lf{Zxc4&6H7_^o$j+s90{i+p<$Z7-E+^P?Jamz+GlOZhuO z2!i+xr9x)f<>+wND<@bxjg_$8Ah&+c6`fx*`1Sk(WJC~EP=x{}=$%#wSchD@WFB!L zKVga;I7D>$I~vXUw;}l87u*eaHtTG{hdIe-PC0}87Wd~g+|E|c=nmnUPA#8E^Gv9X zTo4VuJEQE5(NU2A`x*$e`BCMSNx58`FCV)NZ$~`8vkb-`g~RG-f(6{dE_L|vzIcS&Lk{jr~>Ah+(wn za*nAai%Kb6Qa2^DP51J&a6?6OMO6)$?IW}+!Qjz^>Q=q?f*5@+_kJKQ_P22PERti$ zvv3S`ZCuS2mSw(g#1PH;<;X(>eaN;5+QT8zoz!DBiG3asOfOFqe zTzNq|32%@J>yhwsgpiUFMI?lfk`h8lNeLk&B!rNX5<*X3XRlP&wb45z{yD=q_IP|) zJMv9EoOQ-kQ%M~2tVK+TiAFwA-r)N8W-S|;W@NQ=xu7_Ty75U+Un#aguA-CyU#MEs-|;yQg-oiVk6p`X^Yv3i60I9 zZVVo(4b2yLyki{U>9|Q0k_f4~V^FWSg=Z2>UzfrY+I1OTLy6Jnf5fq}<5K7gDW5e= zlQ2fKhjGU_q7IZpZh{RYRXk)=Yvqu{k7pCho^!`d3?D9HyyVTvQXE&~d(k@tf&nel z&=d+4!=m*Hs*STtx9Y0U?i!qWx{od~PEr>ly}dbg$i1tkiQgf*L~7(SGdInE&7I6e z)k#%Ul{Emns5?)7-=o!WAYjL)lK^^cs+35mt&%%bAj)!vFAi)oQj)5a6)XUb5u!FW z;GqbsA}92W({0$k{aaAf8LYT+JLx_9zp_xroFQd z%$`O%Q37|>TH-xVCDQ$KUb*$}erznAxIc>)pM}%{z$>BO+XK71;l>Z5N4v7^ zcY#s}uM*Fk3g^qsocHaruU%9+?@KQ9sk8?+XNLZR z@AKku?&V>3cCNmPyF|*XT{CBM9F82%QLS1d66IiJ_McU@fDV+slX3z*S^Je$&yug3 z&%2Ito)f<2x^C?JTZ;Q1FjmLOx)OR-_XEER$U+hIt-fc5AmfGy&5ZTEBH5)F@$PJv_Kh3 z(Fh7>7%*ahP*FX#Kz&qt>c6_~?jsSROON*^>evGKJ?}ia?UNA245g7skK*ycqZotZS#ND4hsoaL=M~;Kx1NxC>GkR%6Fn0DK zfHkP6iW$(5yDB0-oh;$Y^su+6kUxO$t05YYf#UVTjvus0S`$O~{3B11 zZXT8bU{PmK%a>HcDjAx$FJr3G+ibzjt$YH|Hx#NRcUM%z2y$0=n8vu93t!g-ZTyp` zS*J4`H2fIc76EXsu?iJ{;_Zp04L-UKRzo&yLlZ0ozdjiKPfgbU*LESaEdPEkrGyiFsmC~WoCE&8FcBrJcG z*ti{J?tLAfc@;Y|S1)hvS2XMRD2x&8v84F4are>ltgmUZRZaOTO89E-j5nsT$1MiB zM4G8YkZCC3YA}*yX(mzCv3a!TrYYaECUj@3@SiMik3j^PmX(x(Dqu8i-JXEKqkTlk z4d_Qa6zUD`u$}}Ykg06rKQlpSvpyO(Z|!H^n~ionw$fZLYgbst6G`x`_TXuh?w<^IbH26Xy%B;m(#`(hspVfOZs!Sc72M?N6)J z;o*~OAhu`4ZWBjhVeam;NvzpOaHbefK*XVt@o{LNrN>>09obklz$VKX6%(0+6CrP=Y>dpuW+z=fp=X9zYTD*+X9HGvsGz`$G|t}(HIG4Ne_N`>y^L&b20QXx zDqtv?S8D^2>YIoF7;p;tqU<#w2BZK|yGcoDpDaUU0i^O`XH!cG50PXu?%k#J0@_++ zfkk0i{iBMF~QR@dbuZ07-xe+W;ugD;oyYn%n>sC%gHR(vQ;*-9=0t zj&BuS;a_6Uhs5OJ@!D&LS$ky+*O${JaQZ5o2j_?#7(%X}%d7)hS%Rz+{kmB7ysKOW zOSiJlzAkW_R_&>$$9+GW_l+c?kNQf9Q6msD*#ngx)2kq=imOtJkyZHe`F#6TW{T$h z-d}k1d|uC1;*DGcdX3s7-J8WYeF)L0g5Jg4M_JK6N{NZ6>_wN3GY>w$UY1}iYY1uU zXW2iph+eCHSHP1qB&6>MTof{(2xZT>eKnE7Ax@UHM1wOVr0)n;P|AQIjr_m^f%+g| zgbEgR%%9oMjs^x0w^J8w$KL?J`}~S(zC)oDgaZH**kXRmmlJA1I;dfZ?m9GJFYQ7A zagI<^Ac0WNr2}+7c?<2t?yGj}t6_PCukAEfH>OrVEOR-83QeoMY3*iAe!#jiMtlZx zSfwW^Nb0C{9hODnuCEoXWXC}?WJr=3guTqwT9llnBdVd)UdXxv=|`FzDB>I-9bs!b zEH2I}@#J5UkDC3c;@be<`}P;8^-_vC6WMo z@Z&HOCWxYrg?OjIfp_tR&L;fayc~x?bkb$zD^i6fi^gjPFoSu@ag7>uY2MU5N-7#^ z{OP8dbjarH%&cZ>N0|%pK!&Jr_KGNZ4#553Jb=^#jx`0g9TGKj@hT{as99VM7&;w(uUH)HwU`m>k}y;clTMuZXCIIZrf+NbM|>1x02cCo%Tna zXw{Hjs?Igoh>cNbC3~o`fqYyp49#ab+D|?EvA-p!5yd@En;E08iPjq%9lL-snF&zZ zSyXmxKW}|qyKJg;q(K!X`#ALM&NNjj6%s~C3dY2;Nm~QOL%W@WDE3D-mW84Q(1UOR zAvB4*(%@is%lFC%5TlPxIB1$UN9PLNC?Xncgf_itCz>&=<`t_7)k6EG`Gz&9F-q95 ztvV>oFfb4o%3{(s*9w4lBzVNObYsiZr|Q|qeC1%Pcva=YS7}zpI9Mv!)#cI?V4aTo z3~P;qHuu2<4%D$kuCyyn{n9LxB^$iv--qN$*Uur0WRp3~aH7MJjYRe4+0!8r)!o;4 zv5`bXH0BW~ z7YT=6uk&>BxH}FvxzpLj&^~bG495Za2Ru5&hS8`!qy8ijH`XM(Gcze9l2bD>mna~( zHijb*UNh6bH*V>dd6|-`=!k+MA|t5OABkVH!UT~lqmIg}1MJ)3dnPQ6%fEFUI4Y~i zQAZ)Tq&XD=@zb-GF^pniO?q?Jbwou~B$ZWFQmTroLP;HapO+>(TCDc9twse^{EDip zkmbGl_(tW(OS={}+w3{({$BO+l4BPpFA_{+aB>5zJM}&2LQ4(-+Hnp6uH{u#+j^?& zw>=-oo4Rd&ZE?$S!0L9s4zqUywPMW;Y6^=S)!5AkGc%B2Jwc*|PyNXl&5@ZbFdiKj zvPGT6mKhF(L&~f$FNcjZlFxR}vVo z{N2CAt_Waun1{Z8P2s%sBv9@{^mrCK#QFD@cTElL&fk9yx*0SD?pzSV`Q@?l#*t36TO=V4P%o-RNng#4V(>MVJXMC$WqijqN++GIc ze146qfq&e3jLM1mONH&$-a!Mk1E*s16JVfWW4Sm?u=sh>`i6k}_UF|dm|`A=yv#XX@G`;LA=rhZx)ea85Op?ybEGnc+@?ie7sy@CpKjI} znP71Dm*;PF!_hn4whwv4^a~(SvrcEQckRGV>F)@Rni_?7KmmxT0>JY3?F-N*kdag) za40Y44|h-txCeE)0)oWp;G^;T1DT+wNapl#6cza0*^(QBxW6MySck&z4SOJSp-$C> zIh1tgSpoPEx2~ElJ#~a3LPm%W_!%Ld=G?k?h0HF94W9rSn4T* zl#pQ&10m8SKnh6o1ndQ@5-qL52D_L?FrdIN#{#mL1xECcr(z62O z7TK~^*~%7&1adP!zXeOPd!S$vtqzc-aKRIU+jEm=A)|LJ8mYFK&BCiDs6>sa>3OZ{ ztYwA;ijFX|*yU}Qkenk)1isqS8&k9%BM%5jJWYXy`7Q>9ji&>J_NL_uDIO0BAJ+!L z+=~ADKc#la3JYGQbKre&`rhXgUP($$XD$4%e})p-Lnk0_d*bJrZY#(!MFsKo*e}^9 zpmZIGK@?k_z~KUb^YrfL0JymwpDy;R^X0EqaeMJn<{1N{6yMK4Iz#7s*LAOJmVqI@ z&2R(@B|<&gl#2)$`JYGa4W{rrTov%zIBW0-hS<5Gxb@|-(}>iyiQ`BWFggW_cE^d( zO!EY?;{ebTC3z8Y0_L^P&t7t@au3E;IiVoXWXlCwaXR(Jb(1P#(n5?3Oav+ytw9sO zJ-kiizsB7(+;JDLB@o}leIZkvz?j@J3bAKV+AcMkN^f9Mv>YzrDJp_EIfCF`j%ZqJ zv>knoT0m)IPQviwZUZ^H9D6LYfZ3A40L=vnPR=wOn+o^-lfm$>i z4!H0Pj1hJ0IC30sfEQp)PAVX{)QTQft6ZSz@C*Xya6_~_!%^HD(u2p2!vM4d>9y$&zivuVpfJaac#pz{Zo13gv@q$+}1EkKZwoPN;@1RRg3 zGjjVe>fO<_2&dTu3TzO@G_8cjEU-2`)5>v}IOb2?nSlZDJdB5#mODhK**u^y5y8KPVQCgb^93F;X8_nL=b z)@FJR!WjW?gb#<)5~ir#gSjxt*a|vG8%Eaio(Ja`6kr=;hiIJWn6j9j#5u2B^-@6k zn1$e=Pk!RO*L{IF0BUy6yTGI_8|s1%kRj;w5G&YkIPWxGz@f7G1}Sf)$9gbeR0$U2 zV{=Nf&LKbsaw^agC8}r-3d-edM^Z9K10x_vDI&&dA?t-eKCyre1R1Syw#YFfm;g-9 z{loQw#^{;)xe3MshCwq(dEj+eKuYshVh2}B31V15gi;bwzRi#< zDX1Nx+&4J|gJFR3))HnNftpYrn|_Vy?gGsm3J%nE2Y@qJv=%8#RRno2)VxL0LmZJo zco#n4o)*CX!6b+TB!tMo53MuW%V+R8WVbtg_0QWWH+LrRcU<;P4%`LGE4B|xv167& zk_UaaTof0KaE88mK+y5%OG?3B zkprws{9}MX3_gh`feqk=U_d+JAnw>wK>VSAT)Oj!z47iog@NOh)0)wl2B5VYL9~sD zV*r}n2^l1Ph0gZ@#kaTbjUQZ12S6DRCvapQrBh&qdXR1I)5g^!_H^oIxwp8|)# zA@|m7Vd(%aeqX>~9>6p@axQa)4FG-KRJ2&Eur_D~!)F7$q2nL0vrnLR5OZJA%s}Vj z5a%ot>ljk-`n|XYYmr>GxlB97@M>(ToqW_`$nR@29&o8=<>BM>TQc?WmX@KT0Gcbb zP$eaZ?{CS>ba4nyVbPoulxtlGRGc*8!iV0FH>Yo(5&1s9BqjfJDjkm5@+T-l7cxUf zU~NJ?hgTsC0X*K~3Rox%cgM7jMb})&>Si1NAy47yJ81K{qUwg)HUQB;233HV96&li z0?&q(3pKA1*lV`(gHtW25Wt2ym{m6U{wyypWeBu1ykkMzyF#v2@&eTWprB5mo821` zDFRFY#>w;)f(D@t5ku95RaN)`{q4Bj-Pj@y0|zKgN(+!EGAIK;fy|^#Pq_%kPloy~ zJ%?Hn!Td(82{7@mzmu7tlLwbrj^Udw(O;gb?fm?1&$z0xuq1vVtuXU3QE_o zE1~l=51+CQcoWpuNeqGe;8=-EFb$CnktfqbM3P8H>%@emsGDMZv#SrMc3|C{bG025 zT~5k}286C!D43b16DA092c)cES41S070fuLp0gG#<@8yH)b^qA?+oA&Gg4J1MJZvD z-Bh)bNVh(&bQ`3(v@}zPLlEr<9z++oG$>QM<0G^z9f1P^0B|4&e+fFD*DfAUQQjNM zSKE<_8)yf790P;c(Y+`_xkAUv;TvvCy1O$)U8W;hZzb7;0%BhRkB1;_oyIRLKI?oS-xblu??^nrufML);;=zC$nzCLUG|mh6s}r|UShbU-)xOwsEa6a^># z$jLtLAV=@E(4N0|K-s_^fb;Y`JPU&&gWMRtABDy8Lt&rr)|)x8AzucY#Lp4X3UHbd zq~o3V0|77;fW!k|XNxeBxSQXOB8sPMkj2n>^NR79vqIEXqeRl{LXmK*HtIsqsA>#E z#<125N5C;mf)8+4X4SX}cmZ%-=?IUqzzr>=iNYq>5CMiI)0Q~V*ncUIIT+|u|JYpn z&Be74K!LR2V~v8O7VGrHM}XgjzILEa6b||<{KjqPvd3@ISPds#ID?^nw8GRakw4G+#OR$ z)?2fqTR>YjE^5^WOha)>H?GmYBXB-vcZgn*jHTdp17N-e$Ut$0W<#ju+FR>$j2s~9 z3+*%m?F9wu8LQ#y1%tPjqlkJ7p{$BvP;3Jw#WMi(NKiXNe^$)!Fi9Z@kcNfqW<$g} z9jZM6OD~tF)?^OK;bXhpiQ0ep16QAC1`vugXrO@w?ra*4eK&08J)yijP36a@Pq;RN zL82S%520KdkD3y&Fw?WUt?WxP4#u1S9oKfd%Aox>DGQDvLXC_%goHf2Z)Lexmhk7#*he_JI^x4 zE4|t>JtC literal 9601 zcmV-{C4SmMT4*^jL0KkKSrydm2ml|&f3^Mm0ATO@t+m;qSm7mOJ{5@#kLg{5<%Ex zBx0BepajAu6nIhUJxpQ^CXE50WYMRogGrzO05l1Z2u%|~8lI*=Cel4Ypcw;A8fY|V z02w_aKmZ1&WTu*_`lslpsP!^50kr_gG{^t}wE*=1GynrYG&BiMNf3m@X)*}VYHUoD z@idRsJxu|SGUxh;LFxblMt}qK0w2K3==y(G)&3{a zK@eRo;!t>n^9C&=V1yEck_r=Oh=(|cOmX@jbe~K8KEGTrtL0wgR9$e|DRBq@VS$a! zdWc-AFEj8fU1gq9VX{$dFO(30v0xA*7%2qNAhCohQwXU5r9g@Wh(Hj71{P>wAwd)& zK`0^syF?I!1WIWEMFpW16%nBXX{w5t^vk6^TlGCHe0sXB zky4p#%j!oNnh_3iy`1%J5e1piX)qf>2`U^3hGPC^4LhsiKPkkWsJaD^r+<$nxzNPt zY*l2^^bLBDgP(lkQ<~{p&b~+TGN|6D=Q9ZGJ)X-E83stt7vHqVy7bwl|BnX^opRb? zx*XtYz6FY}(PQPpo7E28l%4wP*qZ3Zr$fiGu-PAp0LEp(%8|qykdcC6Trc0=QGCg5 z=gs>;4x-9c6b>Q~pn_(K2zZ{cA5Fay)IA755LI6`w%c^bCEz|=1*#VBxCK@P=rGGt zvFe2aNpIxtbeQNK<$sf8gx9WOl5dSsPBzSy`OYdL*>1#E&6*V+AnsM?`7$ZHJG?wif`{?=BSG3tGru>zqd^LEZ4m8$S$nolWLIKd| z=VKyM6)+Uq)ugy-t+lQd<67g%UV8D@sK)Eg>Av95^yrw-PgZ^RgXMUp_1}H>*87;< zXLH5d%$m;;LoJPwY4EPxc8c93{&(x!ZWtDZ+ef&9TpOO%twMGuO)- zSC1+q1YtPgccQ*8ET1WOWOux{%|uRgs~CJJql&CTjSf4 zX?(MxhAu_FCdl93pL(L{M%f^T4Z>~K>_KABC3@>^X|4ip$FpzAx6S^0zE5A? zG*sOr8b$XF@@{F6`gZ$Zo9fr9aI_izW{mHcDwpbk5cAlx9l*z7)7aATC0 zf|xO(`%mt+&+}m#(LwAJ@`7sk0Qg-I9J!DUZ&KR(2eedSKsnq9ux=>M^+ce69$1?= zB*v0AUH728VD_5+POWwT5;3S8XdT}#*!A4+xY^s1<@U4XGwidHToNrm961_Po&~p1 zK?05834-+HbR`8RP(MTgMmyR5@uVPyIGA&$Cnz?mhDAd!<5g5uRaI40RZ=CowGhmQ z(wT9IYM5)^aOO!O$t0EZszp`OM-o!1w<0R4s*1NFs;a80s;hGDRFGLBtdd9)OHIp+ zSfy&HwHj5q1LJtRlMQ*A_J4%KUxlNsQ;J3*hSQzOI;4^^h^< zJUfm2DiD@3_4{Hr)!JldoIMErY(udELC~`vj~%cMe6~f$s6^}~%OnX)Bg@JXLP$vz zk`h8lNeLk&B!rNX5<*Bx2|WEi4O3d`+f?Z>^Bq~opT&<}PW=gwKP_>URMJOIJiS-8 znkuf)+mh7@4yvZUNes~%AR9gm+w_>1GgqmR*;e@#zII*Dsj83yRzgZ-HN5iNeLxO zyDmi}hpI=rwuf~V7BaX zbhsA#!|+1tC2Q^~R2crTIH&p5%1LU&z?B7MmZ zno9T~4J1`Ok}5UwNMc8)6WZsT@zX;G$(XM>Gj^&+a`pH@6O@oZCEB&b!ew~df`wH_ zRjK!oc&0SdNL8Fg*0_cPk zd(YQ9{rl_Zrv8b)wt6dFdcf9(o~0ek2k9q~jB25D zGdh6&x6NRw!An;@Xf|kOwtP+#E~*poqG)23h^{nOVc*-Whj(|UI6is1p7S{F>2|sl zRDvtOvtHBk$}6+4$F9Bm_p0%#hfC7Sy(+BfaY-R1#n58#A`r~X!Gkb~PfyGsTT*9g z><^!dT#WQ+pffWfBr}#|OiHy;E=RM`cOwwKC`S8SDEg;KDkx(v+mFw z`6~H5ySV2m;+^+3(|1pb;=YHfIiForReR7q=VCSD`Mq!YYG9i{LLE>$?-f~-!qJY!j^nV*$msipP0|6k!>kasP;Q8WUm zS!Eafy5J}k*>`azox^vts%tU{z~-gai4@&kA>fpT{>Bj86FcKnBt<*-|9jG)Je02yp5*5Tkey8(!26g`tnoF#d={lM1-NO zy0S8YCqtW;SYK#9a48R0Z|TF;z%hhsNVG5pPy{6q6myIgVt`OlJ}L@6k3tPs)pvIh zh|v;VmZDF@UKB83qO(gtwflwrlLV?Inu5$mK$#Q4C6uQJ-H^}}9<(6R0wsR3%Ag`w zK?d%qn@YZl@^{5 z!U1~ngW{}2Fd*~&Hth_jc*YVX(>*slkmx%^`Oz&fq*;vKno$fLy|`cwgw+-E=Fo(N z-mr-V@cWQTMU)6F=@3=cYIVWa!^6K-3-L#6SoUV~G_r4+wwaRT8`kU$oaUysX7NG_ zm`Fr2B9~qeQ|X+&6yT!9GwflnQ7tvVJI)#nO_ITixQPbeSTMJoNd%?~VNMUzU|Wuh zo~!`Whpx!7=Y^{am!~#Fx?#FO#`ct^<8Kf^<#!97i3o^YSfj@kh>)1rIMYR@$T17?(Xi}_ZZ-_x#H~! z7kQqB$g@p5r9O;q`QUQ$+goWZuWMIW#uG{HTkzP^DdC>j@bkX4-;EK1G~;W%74dmw z_{pti;R+rid^t|`ye+)y@>jsYo^6x0CuQMBi*zw>8*sh#=v8cuXDZ;u=j_B%DOyP6 zjX}$)uJ?82F*O@i&b+g8*=xa*S*8-UWxXt|8_kV2v{l89d1Ca;M%V!Ck`W0+8zXDB z+&-^2GMJSDEIs(rI6EvK&*f&5S+bJrO>m#RVo(wv!T2fms!7u8)IVKjIY3R8GAbtq z2x&I)HSu+7*B31=+_}nHd~;v!+axZ&5WFB?jQ9QTbQEaIzy*eI4OX-XQ`HC*eAb=q(tV4__WKj`!s{dWfzeVt5$HlC>*W zRKpyr_FyL5zrYkl0FWD(EK(pyhgdi9TGshycjvX$o`jVw0-!ez0*M+xbq0dSgh2o) zS=O_h!I*)B{Jl~)1Qt}bt{%41%XX3+yuQEXi*+8==YTXIEGGmEz(Lj4!CWAcmO~vh z&}cGetNkX$a%v&Z<@Wp=EUP7;a6C+c zpd?HX7BQ``Q&AT4$QN8O4F2y;#rcjwuJZkJnX1qs1t)zj_x25}k|6Ma0zeL}lFJJW z=4gSU1l>^7#^ClXJ!ZohA#mJCZwb~MCQlOsohlZz-8o{=X^AObAu2-BlEd(*0hBLf z0a4cw7UC#WQD3|=IRFA!08i2YCLrH1&B4?F2@fCJ4}2%|DE&~97&*DTReJ?}3qBtq z$;0E?Ylm5TWenG~`S6v)^Oh(d0RVG^E$jTAsEx^ft7@Ote$TVf>wdK_gxjB=!Fv6_ zAyxMGdVn{2c}hQ1>H(BUL;RT08X9N~w&n5hz<4odym)CvR8?A(REn;eKHsytJ9Cg8 zL7h7`N;Gcm^r8rim@)@;&lqspuYhOlE!*Kly*cCz_912$PNDkmQQ(P4RbIypEI?Ss zZqL-Y+irWjxyuz+h)Fy}RZZo1gj@${W8fTf4L5mLODxm~31VkDX{@dmV&FvZc#rD- z&@B(zLs|qp09j3U&2Q@I&jSMpTe!vFari(meFU*880t?1D!AuOog4)_K?VxZ&p$p-O)hY49OzTLj=*5+E6oha8$$DBfZ+uvya+R(xNSh&xb(YBz_<|YsscnL;hXu&8;5*uzZ;q+n}iT2 zJ~<250Q2+Z>QE&BzG->Ugy#XdJKJ2e@08NkG20NW2?|n_gG0H9h*s?gFbIW67zf&b zAiM%m`Y?rjS4*|9Ds-LlfGxZD#pyom{{fk(lat-%mR%!MdCAn zIB+=-ga-qa2Yd^63qlS7yPjjd6QE;N?~gGu)_?^LC_p^LQ(G*e8uPS-)F8(mN z#NV5jgOKPhnoPL6(>E^%O@b!^z#yrK7$LU%aIZi)GKnEHrzdxjyn)G7W>zybquWCK zs1Vf-9`K@vxHJ!t901e^AZixtJBe@Ogz8k4Yg=Bmh%khZK(I_UbFjFaURe0Vl&?%5=AOfZ!$T`H7L9IzbFK!<-&JM82*2QFS4w%PBT{Jn=ZGg;1UV|mt%Sq1E@ z<88{#;<$@M z4gm)+0UdJVbusmEl-geuEF3b($2oxFL!sH{C1J(vG4-{*oMec?TJA8z%i>s$Mw!&XIhXKO4 zlJsjf64=${(i1^AJ7_VkHW1US5J2db5}plEx^M20WSJ{~2ygdI-k)%juUv*Pl1%3{ zVip{XYA3HY&Y1{~uI{{I#zhej)0jkccXe(;a|F8q=X2wW9emzE_?ojF->p#O?hXxE zjvPVQ0&g=&h8Tn3J32mjovakm@D{lb(+88fRDe*b*!@>>SzpSJ)yn7J$H(*1YwM+C zOB1X<)@k@=38DVi9}%zc(sJ@NlaIsSHhwE(?{B&S7$6}JlhKj3+Km7+z`8Z#<_5S7 zApw#l0Cq>*AP7~(3B-~_l1V8fiNXN_U}S+oKr0exX2bQGOvx-6&ay~JB%eKGJvH=j zfh0>P$9XgyhIXAL_|S| zc!(g9N8Q!?om@22Iyz~lnK+eK@+zvXLzegPaE;55gpkbaShnC@pVIlb?&%kFQ@f== zE&w$^V@zL!B(UHerx4&8?p0M?x2mqYbJ6<~cV^4g4VnuJoYuz)OC75gXlqbZSmv(A zXgQgjg9G%Ac4B|`bi(3e62k%F>|T;A?kup#b`=k5tT~;Vmv~+moQkqe@It(Syz-;O z?l%UfXcxn7S9f?0?YUjm-Py}!ao=20Oq!hlXo}F*AuIAR@pPAhQR-)9F^IROu`p825FCvzY`aaYNzi zCUR5P{qo7?Tv%hem z@PT?gdlvjVH8qtrzgjdfF*XJ4J!WwNEYA5>cNW;64@{8aV*`pl+;*-7|4Eq4sGq!C zFK+95LI-$FdGH8FiXGzYp+MMK0`UERlK{p9-XvNP$P^dv2dTgU zjYo|3f`Y5oJOaD2Qgrbcs-bNgjkxIRdqUPTM#@*K-KwOn`!sagA?B3Vq2p zFhHy# zq)U0ND z-OC25ZKiW@s>!MnhOSqG4*W@GxyfW}M7ry(Zg9{?n^J_M14`AFtIUPFpgcw%5RiD9 z1{*hb_oPga6N&(1p(*p@8tlvxg0+J ztyjBtKFiXr&n~;vv33aL!kTTwPM8m|N=vGAoeMya;bypk1(Ko8p1TTB(iA|?%=rGW z+++r)01q7p4S!-pG>e)WPhQEg(~8u+iRDNYFgb;abdM95ndS*)#sR1kAP&L-e1O2# zdm_dX6kDI3&T_1B58N}goWzi5G&EqVPA6vA&eCN}I!IB0iGYPd^`IhnkGrtoOZ~R( z)wJX-j+{gjcM;_YPICfd0g%95vyzXH%K2T}#h|FR5%XN5$f+ zFIBLOnB{?x@N@zlPo(sLNe=nGL5{d6rHBZD6}$k#rR*2A2+FI4r~=nF@UL)!1^dsu zE@mVjp+edMg7JmVzz#1cowb6w14V9mKJwF4L=;x3RkneyWGVz31eE8V&@|Ry^B`8H zgL&JI@W{az9SxgC)M|wo2(i$j3u#0Oc1}~FAm7>;1wE{v$c6~%F z5OO|Yo0s8_M((E2BAD6yra5jfv)*B4;9mF*OZ;benpJ&RFty&9IKlYMm2o*gOM~8Fo#E9Z+ zDr*kubM7Yxh}F2n_KD4Vw^d04qY%6l3Gv!jn(nYB^bKc8`1lm1!*x(W)dC*(njv1p zamR6~HG+n#(+MrwOQ&AAu(6aSl3!>EF+P&pqKQZ|5W0!My)*|}%H?cFSs5e+k&q-5 zkO*TCPh>13_RTlfB>Dx>h6BH8pv&+(THB}8Wh(AeYH*H36cZmz0)LZ z%uEgEl(aIqc>#4kWrMNydt>H!IzaQ6+>oc%A%&f0Cy@6B(BOQ7cxI;WUv%SiO#NJh z;{rgyA%g?kL8XF%4_C4Qrx7>W<*~SacC@3mZ}K$FW|gI)u_iLP+i;1540y+Vt`_jL;?~*W?%(< z>8oompV(u|HNffVT>Y|>Z*po!ZO<9K(*bgd=?Au~SnS9&GZ5u_Tof0KaE53~?(UN% z3Hyl|?=dkX25WLz7*k7Z`i=F*g~aYdX$8 zoc+jL3%F2GxUCm36%?RSg$)hGS0e$1%f}T9DM6>OnYIp4#0+3l!aF1)Y$n0>075V< z=OQ1PVN)bvA_Drl9n>v*1SL`q*aa*i45I+mU}dnSeZ3Jn>lDV*x9+{-C1K1GHAvJFFXIvAzdq!e z&j0~4>?AS`QzBu&Ih@S{u&7``&|j!85fy=zH$;Qxhs241KT|Ns#ySV^zTa(*!&f#! z5^f)?H5MJ4m9TE{#wA5DfgmRyD99JycTjfJv1D-;n1UYsIatC8ovPQq93U>P2GYag z5c<}pF!X>IKYQ|+2WjjBVbiq0(iAiS^!C!xVzR)~SQiaA9ZDX^{!-08@ajR$e@8Gw z%Xm}(@L5Ekx^7Kt>i#H3YtVta2XU|4Ge*t!u08b_Hk_GWTXIJ0*MrC8eE8V8@VBJJ zl??&KReFpRWY{c(J-Zn<$YvMZ%dR|a#anM2-5XV`CQ*Wp9aJ;#cBGS_FjR$_+ zMO>KF3y2UPQQQ=A4b@{rC>J1Uba~1_15k#Dq3~fb_j)Jq^(ijK){3z zNCCJI?I0DQ@}V1)&0l8fFdheO31IxjO#?9Sug`X)jA+1l(P0Z6@aJ2T@_eQq2Y7EX zyMB!xlWOuhckVmwlLNU3cDa<#mti&5)VRmOWY|Zo8m`TUbwN8wfzSfYK==@cP)pd1 zhM0)*`-B`f{lB;$BCcxy(`W~bL3oGn?oIt@K9LN>E!oPaNT%ctwv{|25Fwx@kRkU# z5IZ_fnL!qcAQKqE3W(r%RU?!Qpz%K>5%$~0hMd76Jq>xtWRK$l#7bF!Y=~@wKFV5T zl0rXrBqc3G(FojvusSfng5s7zlwgZilQN^xOG;{BkPt?pc{H_M!_Pbr-_BId>(LHA z2w?M>v1dQCW*;-o2h(6-aDZUdEHENc!zH?@Yb23weEHCBlIDS_P93Hp+z>p7FL-Jw zQ@`aSpjbEr3w-jg(PDXABW=ld zS7vCdw8U#J7Zl|I(8fr4_ai#rQrjyf4E1VgWR-hGD9E;lgr$GrFOd#DH)2=9F_96a^>#$jLs| zAV=~xi4UJ%fQH@z_M^|>c;sCf0AAq54-@k?d7+Vio>*TQ+Jq4??z^XOWk`_1_1DJN00pbV`h%Pps zcYldt7uwX-^y zq>zT9l88}z8i;rYGomjrQp;Xme={U@R|_59`Kj%rhJ~ zY}LGYhJoHSlpUNspvN?37@@9c`h>PJl<=aPl8k#gahR5mv64EVYEa*8(^NHhhJnD$ zh9R`bp*4x9X4rir;!YRw-CRruLTpGlacRH--FIuest>Ko661(ct78swEpJ%x-{bG$8W<&Zx%(^1hutDi5*LKDQP&za_K0B!?>krGMo r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?PpGH27_9Cu|Zef;1nGUG9sH08Z?1D zLrqPhYJQ~JY95K{q74{;F$Rp9KUC0Y0MkLBOn^kwNuY>W@$ZMw&fCKs_}w8UO}>28MtHr=*BNVrZw7^vIpY)Owl#9-spt2jn1s#qSp<>&xId z2qG(%xhOUf+zZKx0x5`qh)u!*^MVBV{hx2nO)Kr$h7^6ap4AjxWQOET5FoBCNJ2&h z{94Oqdo6|Xmn!*E1PvA}2*x5nHl$d{RH~wsAQUJ?0>mI7L5T}AF+zeMLV^ejxIqXo zgc!giBnc=*MMP*p8fvITR;f@{g{48Nq*0(~RcTSB5fl-jL_unr0R>fQM4%Rw1b!Ze zwC(#}zJFK0FZnj3=N6GhkD7|72|c*DQrS(>s#aW#VypbJ3R2TTg|!-5&nk^L!IhGX z7bA$XNuHhg{}k8ePqi%vU+}me5K9>K?u21gwslN3<;iDuW|nY@pEE5P0nq{ntq4Xv znP!SgE$g#wBE z)VAK&4YnPT&iEE8zfF&(HiNU3CrvxUOOq3?pBy!aVKLs}K;R|FNW?I$_wDT{zGUC> zej*2G5J$dS;@^p4{I zJEuv?p=@pg!?VNXhRvUD$o=8W{m*yOdE4f{?mLT3{lk}Z8f&F z!n|u-d8^M|_3s#yGSae;MN2X~SRWS6DLFCH=t_A?QjIb}CO(v^mg;)X5koEp$h7#E zhWsMDn_h_Fx$}ORZ;hqPHo4o3X_VS~*PCOX6HODUTW715I9GmDMhL=jwcd*Oys~_y z-6Or_ywpVJP5OJ(&GR+CWx7@KlO7b-`kg0y;W=6-j;1b%2Go_Zcscwr z6pB`IJ?jpVKKFfa_;u;lf{Zxc4&6H7_^o$j+s90{i+p<$Z7-E+^P?Jamz+GlOZhuO z2!i+xr9x)f<>+wND<@bxjg_$8Ah&+c6`fx*`1Sk(WJC~EP=x{}=$%#wSchD@WFB!L zKVga;I7D>$I~vXUw;}l87u*eaHtTG{hdIe-PC0}87Wd~g+|E|c=nmnUPA#8E^Gv9X zTo4VuJEQE5(NU2A`x*$e`BCMSNx58`FCV)NZ$~`8vkb-`g~RG-f(6{dE_L|vzIcS&Lk{jr~>Ah+(wn za*nAai%Kb6Qa2^DP51J&a6?6OMO6)$?IW}+!Qjz^>Q=q?f*5@+_kJKQ_P22PERti$ zvv3S`ZCuS2mSw(g#1PH;<;X(>eaN;5+QT8zoz!DBiG3asOfOFqe zTzNq|32%@J>yhwsgpiUFMI?lfk`h8lNeLk&B!rNX5<*X3XRlP&wb45z{yD=q_IP|) zJMv9EoOQ-kQ%M~2tVK+TiAFwA-r)N8W-S|;W@NQ=xu7_Ty75U+Un#aguA-CyU#MEs-|;yQg-oiVk6p`X^Yv3i60I9 zZVVo(4b2yLyki{U>9|Q0k_f4~V^FWSg=Z2>UzfrY+I1OTLy6Jnf5fq}<5K7gDW5e= zlQ2fKhjGU_q7IZpZh{RYRXk)=Yvqu{k7pCho^!`d3?D9HyyVTvQXE&~d(k@tf&nel z&=d+4!=m*Hs*STtx9Y0U?i!qWx{od~PEr>ly}dbg$i1tkiQgf*L~7(SGdInE&7I6e z)k#%Ul{Emns5?)7-=o!WAYjL)lK^^cs+35mt&%%bAj)!vFAi)oQj)5a6)XUb5u!FW z;GqbsA}92W({0$k{aaAf8LYT+JLx_9zp_xroFQd z%$`O%Q37|>TH-xVCDQ$KUb*$}erznAxIc>)pM}%{z$>BO+XK71;l>Z5N4v7^ zcY#s}uM*Fk3g^qsocHaruU%9+?@KQ9sk8?+XNLZR z@AKku?&V>3cCNmPyF|*XT{CBM9F82%QLS1d66IiJ_McU@fDV+slX3z*S^Je$&yug3 z&%2Ito)f<2x^C?JTZ;Q1FjmLOx)OR-_XEER$U+hIt-fc5AmfGy&5ZTEBH5)F@$PJv_Kh3 z(Fh7>7%*ahP*FX#Kz&qt>c6_~?jsSROON*^>evGKJ?}ia?UNA245g7skK*ycqZotZS#ND4hsoaL=M~;Kx1NxC>GkR%6Fn0DK zfHkP6iW$(5yDB0-oh;$Y^su+6kUxO$t05YYf#UVTjvus0S`$O~{3B11 zZXT8bU{PmK%a>HcDjAx$FJr3G+ibzjt$YH|Hx#NRcUM%z2y$0=n8vu93t!g-ZTyp` zS*J4`H2fIc76EXsu?iJ{;_Zp04L-UKRzo&yLlZ0ozdjiKPfgbU*LESaEdPEkrGyiFsmC~WoCE&8FcBrJcG z*ti{J?tLAfc@;Y|S1)hvS2XMRD2x&8v84F4are>ltgmUZRZaOTO89E-j5nsT$1MiB zM4G8YkZCC3YA}*yX(mzCv3a!TrYYaECUj@3@SiMik3j^PmX(x(Dqu8i-JXEKqkTlk z4d_Qa6zUD`u$}}Ykg06rKQlpSvpyO(Z|!H^n~ionw$fZLYgbst6G`x`_TXuh?w<^IbH26Xy%B;m(#`(hspVfOZs!Sc72M?N6)J z;o*~OAhu`4ZWBjhVeam;NvzpOaHbefK*XVt@o{LNrN>>09obklz$VKX6%(0+6CrP=Y>dpuW+z=fp=X9zYTD*+X9HGvsGz`$G|t}(HIG4Ne_N`>y^L&b20QXx zDqtv?S8D^2>YIoF7;p;tqU<#w2BZK|yGcoDpDaUU0i^O`XH!cG50PXu?%k#J0@_++ zfkk0i{iBMF~QR@dbuZ07-xe+W;ugD;oyYn%n>sC%gHR(vQ;*-9=0t zj&BuS;a_6Uhs5OJ@!D&LS$ky+*O${JaQZ5o2j_?#7(%X}%d7)hS%Rz+{kmB7ysKOW zOSiJlzAkW_R_&>$$9+GW_l+c?kNQf9Q6msD*#ngx)2kq=imOtJkyZHe`F#6TW{T$h z-d}k1d|uC1;*DGcdX3s7-J8WYeF)L0g5Jg4M_JK6N{NZ6>_wN3GY>w$UY1}iYY1uU zXW2iph+eCHSHP1qB&6>MTof{(2xZT>eKnE7Ax@UHM1wOVr0)n;P|AQIjr_m^f%+g| zgbEgR%%9oMjs^x0w^J8w$KL?J`}~S(zC)oDgaZH**kXRmmlJA1I;dfZ?m9GJFYQ7A zagI<^Ac0WNr2}+7c?<2t?yGj}t6_PCukAEfH>OrVEOR-83QeoMY3*iAe!#jiMtlZx zSfwW^Nb0C{9hODnuCEoXWXC}?WJr=3guTqwT9llnBdVd)UdXxv=|`FzDB>I-9bs!b zEH2I}@#J5UkDC3c;@be<`}P;8^-_vC6WMo z@Z&HOCWxYrg?OjIfp_tR&L;fayc~x?bkb$zD^i6fi^gjPFoSu@ag7>uY2MU5N-7#^ z{OP8dbjarH%&cZ>N0|%pK!&Jr_KGNZ4#553Jb=^#jx`0g9TGKj@hT{as99VM7&;w(uUH)HwU`m>k}y;clTMuZXCIIZrf+NbM|>1x02cCo%Tna zXw{Hjs?Igoh>cNbC3~o`fqYyp49#ab+D|?EvA-p!5yd@En;E08iPjq%9lL-snF&zZ zSyXmxKW}|qyKJg;q(K!X`#ALM&NNjj6%s~C3dY2;Nm~QOL%W@WDE3D-mW84Q(1UOR zAvB4*(%@is%lFC%5TlPxIB1$UN9PLNC?Xncgf_itCz>&=<`t_7)k6EG`Gz&9F-q95 ztvV>oFfb4o%3{(s*9w4lBzVNObYsiZr|Q|qeC1%Pcva=YS7}zpI9Mv!)#cI?V4aTo z3~P;qHuu2<4%D$kuCyyn{n9LxB^$iv--qN$*Uur0WRp3~aH7MJjYRe4+0!8r)!o;4 zv5`bXH0BW~ z7YT=6uk&>BxH}FvxzpLj&^~bG495Za2Ru5&hS8`!qy8ijH`XM(Gcze9l2bD>mna~( zHijb*UNh6bH*V>dd6|-`=!k+MA|t5OABkVH!UT~lqmIg}1MJ)3dnPQ6%fEFUI4Y~i zQAZ)Tq&XD=@zb-GF^pniO?q?Jbwou~B$ZWFQmTroLP;HapO+>(TCDc9twse^{EDip zkmbGl_(tW(OS={}+w3{({$BO+l4BPpFA_{+aB>5zJM}&2LQ4(-+Hnp6uH{u#+j^?& zw>=-oo4Rd&ZE?$S!0L9s4zqUywPMW;Y6^=S)!5AkGc%B2Jwc*|PyNXl&5@ZbFdiKj zvPGT6mKhF(L&~f$FNcjZlFxR}vVo z{N2CAt_Waun1{Z8P2s%sBv9@{^mrCK#QFD@cTElL&fk9yx*0SD?pzSV`Q@?l#*t36TO=V4P%o-RNng#4V(>MVJXMC$WqijqN++GIc ze146qfq&e3jLM1mONH&$-a!Mk1E*s16JVfWW4Sm?u=sh>`i6k}_UF|dm|`A=yv#XX@G`;LA=rhZx)ea85Op?ybEGnc+@?ie7sy@CpKjI} znP71Dm*;PF!_hn4whwv4^a~(SvrcEQckRGV>F)@Rni_?7KmmxT0>JY3?F-N*kdag) za40Y44|h-txCeE)0)oWp;G^;T1DT+wNapl#6cza0*^(QBxW6MySck&z4SOJSp-$C> zIh1tgSpoPEx2~ElJ#~a3LPm%W_!%Ld=G?k?h0HF94W9rSn4T* zl#pQ&10m8SKnh6o1ndQ@5-qL52D_L?FrdIN#{#mL1xECcr(z62O z7TK~^*~%7&1adP!zXeOPd!S$vtqzc-aKRIU+jEm=A)|LJ8mYFK&BCiDs6>sa>3OZ{ ztYwA;ijFX|*yU}Qkenk)1isqS8&k9%BM%5jJWYXy`7Q>9ji&>J_NL_uDIO0BAJ+!L z+=~ADKc#la3JYGQbKre&`rhXgUP($$XD$4%e})p-Lnk0_d*bJrZY#(!MFsKo*e}^9 zpmZIGK@?k_z~KUb^YrfL0JymwpDy;R^X0EqaeMJn<{1N{6yMK4Iz#7s*LAOJmVqI@ z&2R(@B|<&gl#2)$`JYGa4W{rrTov%zIBW0-hS<5Gxb@|-(}>iyiQ`BWFggW_cE^d( zO!EY?;{ebTC3z8Y0_L^P&t7t@au3E;IiVoXWXlCwaXR(Jb(1P#(n5?3Oav+ytw9sO zJ-kiizsB7(+;JDLB@o}leIZkvz?j@J3bAKV+AcMkN^f9Mv>YzrDJp_EIfCF`j%ZqJ zv>knoT0m)IPQviwZUZ^H9D6LYfZ3A40L=vnPR=wOn+o^-lfm$>i z4!H0Pj1hJ0IC30sfEQp)PAVX{)QTQft6ZSz@C*Xya6_~_!%^HD(u2p2!vM4d>9y$&zivuVpfJaac#pz{Zo13gv@q$+}1EkKZwoPN;@1RRg3 zGjjVe>fO<_2&dTu3TzO@G_8cjEU-2`)5>v}IOb2?nSlZDJdB5#mODhK**u^y5y8KPVQCgb^93F;X8_nL=b z)@FJR!WjW?gb#<)5~ir#gSjxt*a|vG8%Eaio(Ja`6kr=;hiIJWn6j9j#5u2B^-@6k zn1$e=Pk!RO*L{IF0BUy6yTGI_8|s1%kRj;w5G&YkIPWxGz@f7G1}Sf)$9gbeR0$U2 zV{=Nf&LKbsaw^agC8}r-3d-edM^Z9K10x_vDI&&dA?t-eKCyre1R1Syw#YFfm;g-9 z{loQw#^{;)xe3MshCwq(dEj+eKuYshVh2}B31V15gi;bwzRi#< zDX1Nx+&4J|gJFR3))HnNftpYrn|_Vy?gGsm3J%nE2Y@qJv=%8#RRno2)VxL0LmZJo zco#n4o)*CX!6b+TB!tMo53MuW%V+R8WVbtg_0QWWH+LrRcU<;P4%`LGE4B|xv167& zk_UaaTof0KaE88mK+y5%OG?3B zkprws{9}MX3_gh`feqk=U_d+JAnw>wK>VSAT)Oj!z47iog@NOh)0)wl2B5VYL9~sD zV*r}n2^l1Ph0gZ@#kaTbjUQZ12S6DRCvapQrBh&qdXR1I)5g^!_H^oIxwp8|)# zA@|m7Vd(%aeqX>~9>6p@axQa)4FG-KRJ2&Eur_D~!)F7$q2nL0vrnLR5OZJA%s}Vj z5a%ot>ljk-`n|XYYmr>GxlB97@M>(ToqW_`$nR@29&o8=<>BM>TQc?WmX@KT0Gcbb zP$eaZ?{CS>ba4nyVbPoulxtlGRGc*8!iV0FH>Yo(5&1s9BqjfJDjkm5@+T-l7cxUf zU~NJ?hgTsC0X*K~3Rox%cgM7jMb})&>Si1NAy47yJ81K{qUwg)HUQB;233HV96&li z0?&q(3pKA1*lV`(gHtW25Wt2ym{m6U{wyypWeBu1ykkMzyF#v2@&eTWprB5mo821` zDFRFY#>w;)f(D@t5ku95RaN)`{q4Bj-Pj@y0|zKgN(+!EGAIK;fy|^#Pq_%kPloy~ zJ%?Hn!Td(82{7@mzmu7tlLwbrj^Udw(O;gb?fm?1&$z0xuq1vVtuXU3QE_o zE1~l=51+CQcoWpuNeqGe;8=-EFb$CnktfqbM3P8H>%@emsGDMZv#SrMc3|C{bG025 zT~5k}286C!D43b16DA092c)cES41S070fuLp0gG#<@8yH)b^qA?+oA&Gg4J1MJZvD z-Bh)bNVh(&bQ`3(v@}zPLlEr<9z++oG$>QM<0G^z9f1P^0B|4&e+fFD*DfAUQQjNM zSKE<_8)yf790P;c(Y+`_xkAUv;TvvCy1O$)U8W;hZzb7;0%BhRkB1;_oyIRLKI?oS-xblu??^nrufML);;=zC$nzCLUG|mh6s}r|UShbU-)xOwsEa6a^># z$jLtLAV=@E(4N0|K-s_^fb;Y`JPU&&gWMRtABDy8Lt&rr)|)x8AzucY#Lp4X3UHbd zq~o3V0|77;fW!k|XNxeBxSQXOB8sPMkj2n>^NR79vqIEXqeRl{LXmK*HtIsqsA>#E z#<125N5C;mf)8+4X4SX}cmZ%-=?IUqzzr>=iNYq>5CMiI)0Q~V*ncUIIT+|u|JYpn z&Be74K!LR2V~v8O7VGrHM}XgjzILEa6b||<{KjqPvd3@ISPds#ID?^nw8GRakw4G+#OR$ z)?2fqTR>YjE^5^WOha)>H?GmYBXB-vcZgn*jHTdp17N-e$Ut$0W<#ju+FR>$j2s~9 z3+*%m?F9wu8LQ#y1%tPjqlkJ7p{$BvP;3Jw#WMi(NKiXNe^$)!Fi9Z@kcNfqW<$g} z9jZM6OD~tF)?^OK;bXhpiQ0ep16QAC1`vugXrO@w?ra*4eK&08J)yijP36a@Pq;RN zL82S%520KdkD3y&Fw?WUt?WxP4#u1S9oKfd%Aox>DGQDvLXC_%goHf2Z)Lexmhk7#*he_JI^x4 zE4|t>JtC literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 literal 9601 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 r4kB`Px2wzX_uG_J<X-KU{YKZv`MDZ+$+uBTu?P Date: Sun, 9 Apr 2017 23:26:49 +0200 Subject: [PATCH 32/58] Optimize ENVs and LABELs Prevent superfluous images for multiple ENVs and LABELs --- docker/apache-dev/alpine/Dockerfile | 6 +- docker/apache-dev/centos-7/Dockerfile | 6 +- docker/apache-dev/debian-7/Dockerfile | 6 +- docker/apache-dev/debian-8/Dockerfile | 6 +- docker/apache-dev/debian-9/Dockerfile | 6 +- docker/apache-dev/ubuntu-12.04/Dockerfile | 6 +- docker/apache-dev/ubuntu-14.04/Dockerfile | 6 +- docker/apache-dev/ubuntu-15.04/Dockerfile | 6 +- docker/apache-dev/ubuntu-15.10/Dockerfile | 6 +- docker/apache-dev/ubuntu-16.04/Dockerfile | 6 +- docker/apache-dev/ubuntu-16.10/Dockerfile | 6 +- docker/apache/alpine/Dockerfile | 6 +- docker/apache/centos-7/Dockerfile | 6 +- docker/apache/debian-7/Dockerfile | 6 +- docker/apache/debian-8/Dockerfile | 6 +- docker/apache/debian-9/Dockerfile | 6 +- docker/apache/ubuntu-12.04/Dockerfile | 6 +- docker/apache/ubuntu-14.04/Dockerfile | 6 +- docker/apache/ubuntu-15.04/Dockerfile | 6 +- docker/apache/ubuntu-15.10/Dockerfile | 6 +- docker/apache/ubuntu-16.04/Dockerfile | 6 +- docker/apache/ubuntu-16.10/Dockerfile | 6 +- docker/base-app/alpine/Dockerfile | 10 +-- docker/base-app/centos-7/Dockerfile | 10 +-- docker/base-app/debian-7/Dockerfile | 10 +-- docker/base-app/debian-8/Dockerfile | 10 +-- docker/base-app/debian-9/Dockerfile | 10 +-- docker/base-app/ubuntu-12.04/Dockerfile | 10 +-- docker/base-app/ubuntu-14.04/Dockerfile | 10 +-- docker/base-app/ubuntu-15.04/Dockerfile | 10 +-- docker/base-app/ubuntu-15.10/Dockerfile | 10 +-- docker/base-app/ubuntu-16.04/Dockerfile | 10 +-- docker/base-app/ubuntu-16.10/Dockerfile | 10 +-- docker/base/alpine/Dockerfile | 6 +- docker/base/centos-7/Dockerfile | 6 +- docker/base/debian-7/Dockerfile | 6 +- docker/base/debian-8/Dockerfile | 6 +- docker/base/debian-9/Dockerfile | 6 +- docker/base/ubuntu-12.04/Dockerfile | 6 +- docker/base/ubuntu-14.04/Dockerfile | 6 +- docker/base/ubuntu-15.04/Dockerfile | 6 +- docker/base/ubuntu-15.10/Dockerfile | 6 +- docker/base/ubuntu-16.04/Dockerfile | 6 +- docker/base/ubuntu-16.10/Dockerfile | 6 +- docker/bootstrap/alpine/Dockerfile | 14 ++-- docker/bootstrap/centos-7/Dockerfile | 14 ++-- docker/bootstrap/debian-7/Dockerfile | 14 ++-- docker/bootstrap/debian-8/Dockerfile | 14 ++-- docker/bootstrap/debian-9/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-12.04/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-14.04/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-15.04/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-15.10/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-16.04/Dockerfile | 14 ++-- docker/bootstrap/ubuntu-16.10/Dockerfile | 14 ++-- docker/hhvm-apache/ubuntu-14.04/Dockerfile | 8 +-- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 8 +-- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 8 +-- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 8 +-- docker/hhvm/ubuntu-14.04/Dockerfile | 6 +- docker/hhvm/ubuntu-16.04/Dockerfile | 6 +- docker/liquibase/latest/Dockerfile | 28 ++++---- docker/liquibase/mysql/Dockerfile | 28 ++++---- docker/liquibase/postgres/Dockerfile | 28 ++++---- docker/mail-sandbox/latest/Dockerfile | 4 +- docker/nginx-dev/alpine/Dockerfile | 6 +- docker/nginx-dev/centos-7/Dockerfile | 6 +- docker/nginx-dev/debian-7/Dockerfile | 6 +- docker/nginx-dev/debian-8/Dockerfile | 6 +- docker/nginx-dev/debian-9/Dockerfile | 6 +- docker/nginx-dev/ubuntu-12.04/Dockerfile | 6 +- docker/nginx-dev/ubuntu-14.04/Dockerfile | 6 +- docker/nginx-dev/ubuntu-15.04/Dockerfile | 6 +- docker/nginx-dev/ubuntu-15.10/Dockerfile | 6 +- docker/nginx-dev/ubuntu-16.04/Dockerfile | 6 +- docker/nginx-dev/ubuntu-16.10/Dockerfile | 6 +- docker/nginx/alpine/Dockerfile | 6 +- docker/nginx/centos-7/Dockerfile | 6 +- docker/nginx/debian-7/Dockerfile | 6 +- docker/nginx/debian-8/Dockerfile | 6 +- docker/nginx/debian-9/Dockerfile | 6 +- docker/nginx/ubuntu-12.04/Dockerfile | 6 +- docker/nginx/ubuntu-14.04/Dockerfile | 6 +- docker/nginx/ubuntu-15.04/Dockerfile | 6 +- docker/nginx/ubuntu-15.10/Dockerfile | 6 +- docker/nginx/ubuntu-16.04/Dockerfile | 6 +- docker/nginx/ubuntu-16.10/Dockerfile | 6 +- docker/php-apache-dev/5.6/Dockerfile | 10 +-- docker/php-apache-dev/7.0/Dockerfile | 10 +-- docker/php-apache-dev/7.1/Dockerfile | 10 +-- .../php-apache-dev/alpine-3-php7/Dockerfile | 10 +-- docker/php-apache-dev/alpine/Dockerfile | 10 +-- .../php-apache-dev/centos-7-php56/Dockerfile | 10 +-- .../php-apache-dev/centos-7-php7/Dockerfile | 10 +-- docker/php-apache-dev/centos-7/Dockerfile | 10 +-- docker/php-apache-dev/debian-7/Dockerfile | 10 +-- .../php-apache-dev/debian-8-php7/Dockerfile | 10 +-- docker/php-apache-dev/debian-8/Dockerfile | 10 +-- docker/php-apache-dev/debian-9/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 10 +-- docker/php-apache-dev/ubuntu-16.10/Dockerfile | 10 +-- docker/php-apache/5.6/Dockerfile | 8 +-- docker/php-apache/7.0/Dockerfile | 8 +-- docker/php-apache/7.1/Dockerfile | 8 +-- docker/php-apache/alpine-3-php7/Dockerfile | 8 +-- docker/php-apache/alpine/Dockerfile | 8 +-- docker/php-apache/centos-7-php56/Dockerfile | 8 +-- docker/php-apache/centos-7-php7/Dockerfile | 8 +-- docker/php-apache/centos-7/Dockerfile | 8 +-- docker/php-apache/debian-7/Dockerfile | 8 +-- docker/php-apache/debian-8-php7/Dockerfile | 8 +-- docker/php-apache/debian-8/Dockerfile | 8 +-- docker/php-apache/debian-9/Dockerfile | 8 +-- docker/php-apache/ubuntu-12.04/Dockerfile | 8 +-- docker/php-apache/ubuntu-14.04/Dockerfile | 8 +-- docker/php-apache/ubuntu-15.04/Dockerfile | 8 +-- docker/php-apache/ubuntu-15.10/Dockerfile | 8 +-- docker/php-apache/ubuntu-16.04/Dockerfile | 8 +-- docker/php-apache/ubuntu-16.10/Dockerfile | 8 +-- docker/php-nginx-dev/5.6/Dockerfile | 10 +-- docker/php-nginx-dev/7.0/Dockerfile | 10 +-- docker/php-nginx-dev/7.1/Dockerfile | 10 +-- docker/php-nginx-dev/alpine-3-php7/Dockerfile | 10 +-- docker/php-nginx-dev/alpine/Dockerfile | 10 +-- .../php-nginx-dev/centos-7-php56/Dockerfile | 10 +-- docker/php-nginx-dev/centos-7-php7/Dockerfile | 10 +-- docker/php-nginx-dev/centos-7/Dockerfile | 10 +-- docker/php-nginx-dev/debian-7/Dockerfile | 10 +-- docker/php-nginx-dev/debian-8-php7/Dockerfile | 10 +-- docker/php-nginx-dev/debian-8/Dockerfile | 10 +-- docker/php-nginx-dev/debian-9/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 10 +-- docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 10 +-- docker/php-nginx/5.6/Dockerfile | 8 +-- docker/php-nginx/7.0/Dockerfile | 8 +-- docker/php-nginx/7.1/Dockerfile | 8 +-- docker/php-nginx/alpine-3-php7/Dockerfile | 8 +-- docker/php-nginx/alpine/Dockerfile | 8 +-- docker/php-nginx/centos-7-php56/Dockerfile | 8 +-- docker/php-nginx/centos-7-php7/Dockerfile | 8 +-- docker/php-nginx/centos-7/Dockerfile | 8 +-- docker/php-nginx/debian-7/Dockerfile | 8 +-- docker/php-nginx/debian-8-php7/Dockerfile | 8 +-- docker/php-nginx/debian-8/Dockerfile | 8 +-- docker/php-nginx/debian-9/Dockerfile | 8 +-- docker/php-nginx/ubuntu-12.04/Dockerfile | 8 +-- docker/php-nginx/ubuntu-14.04/Dockerfile | 8 +-- docker/php-nginx/ubuntu-15.04/Dockerfile | 8 +-- docker/php-nginx/ubuntu-15.10/Dockerfile | 8 +-- docker/php-nginx/ubuntu-16.04/Dockerfile | 8 +-- docker/php-nginx/ubuntu-16.10/Dockerfile | 8 +-- docker/php-official/5.6/Dockerfile | 30 ++++----- docker/php-official/7.0/Dockerfile | 30 ++++----- docker/php-official/7.1/Dockerfile | 30 ++++----- docker/php/alpine-3-php7/Dockerfile | 6 +- docker/php/alpine/Dockerfile | 6 +- docker/php/centos-7-php56/Dockerfile | 6 +- docker/php/centos-7-php7/Dockerfile | 6 +- docker/php/centos-7/Dockerfile | 6 +- docker/php/debian-7/Dockerfile | 6 +- docker/php/debian-8-php7/Dockerfile | 6 +- docker/php/debian-8/Dockerfile | 6 +- docker/php/debian-9/Dockerfile | 6 +- docker/php/ubuntu-12.04/Dockerfile | 6 +- docker/php/ubuntu-14.04/Dockerfile | 6 +- docker/php/ubuntu-15.04/Dockerfile | 6 +- docker/php/ubuntu-15.10/Dockerfile | 6 +- docker/php/ubuntu-16.04/Dockerfile | 6 +- docker/php/ubuntu-16.10/Dockerfile | 6 +- docker/samson-deployment/latest/Dockerfile | 22 +++---- docker/typo3-solr/3.1/Dockerfile | 16 ++--- docker/typo3-solr/5.0/Dockerfile | 16 ++--- docker/typo3-solr/6.0/Dockerfile | 16 ++--- docker/vsftp/latest/Dockerfile | 10 +-- template/Dockerfile/docker.jinja2 | 8 +-- template/Dockerfile/environment.jinja2 | 64 +++++++++---------- 184 files changed, 853 insertions(+), 853 deletions(-) diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 4ca73a703..c1a230fa1 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 70f341c0f..72d6bddb5 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index a7b169561..929fb96b2 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:debian-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 37abb640c..4027f68d0 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index e58881e1a..1d2d95e8e 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:debian-9 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index cd3265be3..8edaed4d1 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-12.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index 0c72ab077..ea0a0d218 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index de6cffe55..78bd50442 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-15.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index 4050373da..faf7e2174 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-15.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index eb41429a0..2d6803247 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index e534a2910..505605798 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/apache:ubuntu-16.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index cabc08dd1..d5e84c1f8 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index b96dbd5e3..f254aaf0b 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index 97436d0e8..c3fab7340 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index e9565e669..dacb7b4f6 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index ec4cbda07..a4f9c31cd 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-9 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index b753260bc..7ca7ab25a 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-12.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index 86d1729fe..e890ba71b 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index d181af9bf..3693a147d 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-15.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index a37e2162a..b97ed8fd5 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-15.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 005d9643b..32db5e021 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 7aa57a05f..90915db34 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-16.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index b04b48ab9..696b1d933 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:alpine-3 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index f2e584664..f86b04355 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:centos-7 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 41c60e76c..6bea67ac2 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:debian-7 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 256b946e9..3aaf12cc6 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:debian-8 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 00fcdf90d..b2705c08c 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:debian-9 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 0880dd8c7..7a7defdf5 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-12.04 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index fdbcbd82b..1ec898006 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-14.04 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 0a616385c..8a7c1f275 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-15.04 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 13b796072..0c62b0450 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-15.10 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index c772e0667..8a75d0673 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-16.04 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index fc249e92a..8e2ebb131 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:ubuntu-16.10 -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 COPY conf/ /opt/docker/ diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 354a20c89..0e470fa84 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:alpine-3 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 7c97f0660..9245359c3 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:centos-7 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 45c128a3e..8b426c7e5 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:debian-7 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index c2074a36a..34614ec16 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:debian-8 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index b96410977..862e4f2bd 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:debian-9 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 000312e04..36f93e96c 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-12.04 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 0883c8816..a6e38ac1e 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-14.04 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index fe1da7080..ee32e2cae 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-15.04 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 7ec01aa73..6ac82010d 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-15.10 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 87afde2ef..0c966ebb0 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-16.04 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index a5a415e4e..be96a1e1d 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/bootstrap:ubuntu-16.10 -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 4fd887527..259275af2 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -5,14 +5,14 @@ FROM alpine:3.5 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 5b82ac214..b99e79319 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -5,14 +5,14 @@ FROM centos:7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index fa279ae39..1f4d02777 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -5,14 +5,14 @@ FROM debian:7 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index beaba7588..bb4c76f1c 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -5,14 +5,14 @@ FROM debian:8 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 1a25d489b..9c195b3f3 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -5,14 +5,14 @@ FROM debian:stretch -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index dfc97ecff..35ae85c3b 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:12.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 9de36632b..6ad699b9d 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:14.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 985948a11..c032414be 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:15.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index ad79f9cda..06787f898 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:15.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 86ec15081..775d612f8 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:16.04 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index d0b623fdc..1d884c73d 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -5,14 +5,14 @@ FROM ubuntu:16.10 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 72ed57cea..26c575a99 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/hhvm:ubuntu-14.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 6537f2ea8..df73bbc6e 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/hhvm:ubuntu-16.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index 96fc9f9b6..69f10e4aa 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/hhvm:ubuntu-14.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index e7f090c8a..7d089d22b 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/hhvm:ubuntu-16.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 23095fa8e..08c86e08f 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index f16d889a4..7f070fc71 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/liquibase/latest/Dockerfile b/docker/liquibase/latest/Dockerfile index 11b1b0b1d..5f27f1828 100644 --- a/docker/liquibase/latest/Dockerfile +++ b/docker/liquibase/latest/Dockerfile @@ -5,20 +5,20 @@ FROM java:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION "3.5.3" -ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" -ENV LIQUIBASE_CLASSPATH "/usr/share/java/mysql.jar" -ENV LIQUIBASE_URL "" -ENV LIQUIBASE_USERNAME "" -ENV LIQUIBASE_PASSWORD "" -ENV LIQUIBASE_CHANGELOG "liquibase.xml" -ENV LIQUIBASE_CONTEXTS "" -ENV LIQUIBASE_OPTS "" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV LIQUIBASE_VERSION="3.5.3" \ + LIQUIBASE_DRIVER="com.mysql.jdbc.Driver" \ + LIQUIBASE_CLASSPATH="/usr/share/java/mysql.jar" \ + LIQUIBASE_URL="" \ + LIQUIBASE_USERNAME="" \ + LIQUIBASE_PASSWORD="" \ + LIQUIBASE_CHANGELOG="liquibase.xml" \ + LIQUIBASE_CONTEXTS="" \ + LIQUIBASE_OPTS="" COPY conf/ /opt/docker/ diff --git a/docker/liquibase/mysql/Dockerfile b/docker/liquibase/mysql/Dockerfile index 6943d3b2c..540ffd5c7 100644 --- a/docker/liquibase/mysql/Dockerfile +++ b/docker/liquibase/mysql/Dockerfile @@ -5,20 +5,20 @@ FROM java:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION "3.5.3" -ENV LIQUIBASE_DRIVER "com.mysql.jdbc.Driver" -ENV LIQUIBASE_CLASSPATH "/usr/share/java/mysql.jar" -ENV LIQUIBASE_URL "" -ENV LIQUIBASE_USERNAME "" -ENV LIQUIBASE_PASSWORD "" -ENV LIQUIBASE_CHANGELOG "liquibase.xml" -ENV LIQUIBASE_CONTEXTS "" -ENV LIQUIBASE_OPTS "" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV LIQUIBASE_VERSION="3.5.3" \ + LIQUIBASE_DRIVER="com.mysql.jdbc.Driver" \ + LIQUIBASE_CLASSPATH="/usr/share/java/mysql.jar" \ + LIQUIBASE_URL="" \ + LIQUIBASE_USERNAME="" \ + LIQUIBASE_PASSWORD="" \ + LIQUIBASE_CHANGELOG="liquibase.xml" \ + LIQUIBASE_CONTEXTS="" \ + LIQUIBASE_OPTS="" COPY conf/ /opt/docker/ diff --git a/docker/liquibase/postgres/Dockerfile b/docker/liquibase/postgres/Dockerfile index aab855098..9c4ad6971 100644 --- a/docker/liquibase/postgres/Dockerfile +++ b/docker/liquibase/postgres/Dockerfile @@ -5,20 +5,20 @@ FROM java:latest -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV LIQUIBASE_VERSION "3.5.3" -ENV LIQUIBASE_DRIVER "org.postgresql.Driver" -ENV LIQUIBASE_CLASSPATH "/usr/share/java/postgresql.jar" -ENV LIQUIBASE_URL "" -ENV LIQUIBASE_USERNAME "" -ENV LIQUIBASE_PASSWORD "" -ENV LIQUIBASE_CHANGELOG "liquibase.xml" -ENV LIQUIBASE_CONTEXTS "" -ENV LIQUIBASE_OPTS "" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV LIQUIBASE_VERSION="3.5.3" \ + LIQUIBASE_DRIVER="org.postgresql.Driver" \ + LIQUIBASE_CLASSPATH="/usr/share/java/postgresql.jar" \ + LIQUIBASE_URL="" \ + LIQUIBASE_USERNAME="" \ + LIQUIBASE_PASSWORD="" \ + LIQUIBASE_CHANGELOG="liquibase.xml" \ + LIQUIBASE_CONTEXTS="" \ + LIQUIBASE_OPTS="" COPY conf/ /opt/docker/ diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 2ce674257..4f218b4e4 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -5,8 +5,8 @@ FROM webdevops/php-nginx:latest -ENV MAILBOX_USERNAME "dev" -ENV MAILBOX_PASSWORD "dev" +ENV MAILBOX_USERNAME="dev" \ + MAILBOX_PASSWORD="dev" COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index c9031db1b..70c3d02f0 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index ff452e888..3d1cdb799 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 5b75700d5..83011f369 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:debian-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index 2c1756438..d929d08a7 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 43097ae32..82719d364 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:debian-9 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index a95e02ff2..058cb4406 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-12.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 4f23d6fcf..8e1398af6 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 51153c471..52df57365 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-15.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index 50bea1c8a..e7a759387 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-15.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index 118cd3080..cffce7d12 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index ced2fc10a..42d527956 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/nginx:ubuntu-16.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index ce1bb37da..7d54cf4f5 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 2a712283d..75f4220b4 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 26f6d8ec2..668f78582 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 7c9e65985..a56051125 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 2dce7d253..311f8ebc4 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:debian-9 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index b1b1fc300..b18c6891d 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-12.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index ad39bd700..8aabcd1ac 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index 4d7102074..a82387df2 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-15.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index ea4ae3161..7b13c8bd2 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-15.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 8efc063cb..13537074b 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index b6d4de27d..4a0494b9e 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base:ubuntu-16.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index 36e2462ea..e50479a3f 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:5.6 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index ebfbb208c..953262147 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:7.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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index e3e457211..e3e780c2f 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:7.1 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -ENV WEB_PHP_SOCKET 127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 71a175d00..5eb88cce8 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:alpine-3-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/alpine/Dockerfile b/docker/php-apache-dev/alpine/Dockerfile index 8a5fe170c..a7d8b5e02 100644 --- a/docker/php-apache-dev/alpine/Dockerfile +++ b/docker/php-apache-dev/alpine/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:alpine-3 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index e85e5f132..cdf335f5d 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7-php56 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index d8d355d96..eb6143dea 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 93c12af66..1049fdce7 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 769205509..025b220b2 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index b2f3b0ad6..74c5088d0 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-8-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index cc4158aa0..349c1ca49 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-8 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index d8f2d0a4e..f5c138ec6 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-9 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index f670b12cf..f4901d6db 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-12.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index 64df9de18..d4f17e4f0 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-14.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 31c28902e..410e6b665 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-15.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index 39f455b54..df5988603 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-15.10 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 79a0664ab..b6ff2581d 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-16.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 651d5ac13..09e3beaf7 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-16.10 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index d0e266c12..23026fe67 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:5.6 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index f684b42be..4ab862e0b 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:7.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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index c1eb991bd..1048079c5 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:7.1 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 3f3729286..349474e38 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:alpine-3-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/alpine/Dockerfile b/docker/php-apache/alpine/Dockerfile index 52f71259d..1b18c741e 100644 --- a/docker/php-apache/alpine/Dockerfile +++ b/docker/php-apache/alpine/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:alpine-3 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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 b/docker/php-apache/centos-7-php56/Dockerfile index b828b9a49..bd8b9e4d5 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7-php56 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index b18142d6a..2854a749e 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 90b28a550..178a7e028 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index a0d5308b0..c0962ce69 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index a24cd28da..25d870c80 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-8-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index 09b284130..fec243523 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-8 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index a76682532..6e2579477 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-9 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index f701b5efd..092ccd4d9 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-12.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 7e8a28062..e34059c15 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-14.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index 3da2a128a..a33c97406 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-15.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 189526ba5..b80593bdb 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-15.10 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 334f0ba64..7a6961fea 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-16.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index d68e80d01..ebef86d2e 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-16.10 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 764c63c33..33fb3bcbf 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:5.6 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 39c8a85b3..7890f7dde 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:7.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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index c65e4f943..7cb438344 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:7.1 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -ENV WEB_PHP_SOCKET 127.0.0.1:9000 -ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index 56744370d..278999476 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:alpine-3-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/alpine/Dockerfile b/docker/php-nginx-dev/alpine/Dockerfile index 448706389..a7253fe6c 100644 --- a/docker/php-nginx-dev/alpine/Dockerfile +++ b/docker/php-nginx-dev/alpine/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:alpine-3 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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 b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 7c67eda04..26d97c633 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7-php56 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index 4ec56b4ed..fde569e3b 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 875856946..ac768f4b4 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:centos-7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 790152c03..85255c2e7 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index aa29b54d7..370c79478 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-8-php7 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index 7f6e39af1..b4efc399a 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-8 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index 1620f66d3..ef61881ad 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:debian-9 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 936ed0164..709544610 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-12.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index c7e082a4f..6fddb112b 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-14.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 097e56726..2c95afe38 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-15.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 3cb04d471..3758eac1f 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-15.10 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index cb31dd263..ebc9fd864 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-16.04 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index 1952fc82e..b1318bb9c 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/php-dev:ubuntu-16.10 -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)$" +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index 19ea2dca1..c0e11a920 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:5.6 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 447491438..47faf6f07 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:7.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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 8ad3e5c6e..25771451a 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:7.1 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm -ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index 2e2806eb4..480dc3680 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:alpine-3-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/alpine/Dockerfile b/docker/php-nginx/alpine/Dockerfile index 16a2ebdce..1ec038e33 100644 --- a/docker/php-nginx/alpine/Dockerfile +++ b/docker/php-nginx/alpine/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:alpine-3 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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 b/docker/php-nginx/centos-7-php56/Dockerfile index 08cc5c758..5b8041a5b 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7-php56 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index ea885b19a..2fb4fa57a 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + 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/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 02c9ab15e..9f3578ccd 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:centos-7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index 3135c1839..e6eceb32f 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 3ccb49093..aa13a2423 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-8-php7 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index acda1fbc3..637fcffdf 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-8 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index 96bdc44a0..f1b463881 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:debian-9 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index e3a07ca61..675c0a709 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-12.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index ca1c7877f..4809ec3f5 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-14.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index fe8e013a9..0fb79026d 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-15.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 306ad8aba..3abbfc37c 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-15.10 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index a331121ab..204ef7739 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-16.04 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index c5c9eb92f..00b36f982 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -5,10 +5,10 @@ FROM webdevops/php:ubuntu-16.10 -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_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm +ENV WEB_PHP_SOCKET=127.0.0.1:9000 COPY conf/ /opt/docker/ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index e4ad46fb9..0be41a66a 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -5,22 +5,22 @@ FROM php:5.6-fpm -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 ADD baselayout.tar / diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 85be82a9c..8d7da39a9 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -5,22 +5,22 @@ FROM php:7.0-fpm -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 ADD baselayout.tar / diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 05e3a0d7f..4347e292a 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -5,22 +5,22 @@ FROM php:7.1-fpm -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 ADD baselayout.tar / diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 0e3095d43..7b9c32eaa 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/alpine/Dockerfile b/docker/php/alpine/Dockerfile index b4f40276a..d22302204 100644 --- a/docker/php/alpine/Dockerfile +++ b/docker/php/alpine/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:alpine-3 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index f61e3a688..535b1acb0 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index e1a0708b3..dcad45ad2 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index ac909bddd..d3666756c 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:centos-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 99face657..9cd028b4c 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:debian-7 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 3ac5deb03..d4b20eaf0 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 0703b2877..8bb51115a 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:debian-8 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index c893c7bb8..627a90bf7 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:debian-9 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 053a2f267..71eefd405 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-12.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 9e5d06a45..10a115587 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-14.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index a4f6f7a77..3c8061625 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-15.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 49f3413b1..3aea3b00b 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-15.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 4fefaf98a..5c7ac8c45 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-16.04 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 29b922a17..494f08d41 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -5,9 +5,9 @@ FROM webdevops/base-app:ubuntu-16.10 -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index ec94517f4..b1bdc6d5d 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -10,9 +10,9 @@ FROM zendesk/samson:latest # Bootstrap ############################################################################### -ENV TERM "xterm" -ENV LANG "en_US.UTF-8" -ENV LC_ALL "en_US.UTF-8" +ENV TERM="xterm" \ + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" ADD baselayout.tar / @@ -58,9 +58,9 @@ RUN set -x \ # Base ############################################################################### -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" COPY conf/ /opt/docker/ @@ -108,11 +108,11 @@ RUN chmod +x /opt/docker/bin/* \ # Base-app ############################################################################### -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 # Install services RUN /usr/local/bin/apt-install \ diff --git a/docker/typo3-solr/3.1/Dockerfile b/docker/typo3-solr/3.1/Dockerfile index a6e3f74c3..e0a2958fd 100644 --- a/docker/typo3-solr/3.1/Dockerfile +++ b/docker/typo3-solr/3.1/Dockerfile @@ -5,14 +5,14 @@ FROM guywithnose/solr:4.10.4 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV TERM "xterm" -ENV LANG "C.UTF-8" -ENV LC_ALL "C.UTF-8" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" USER root diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 3719771ae..270d6b520 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -5,14 +5,14 @@ FROM guywithnose/solr:4.10.4 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV TERM "xterm" -ENV LANG "C.UTF-8" -ENV LC_ALL "C.UTF-8" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" USER root diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index b9df3d351..8f2b17ecf 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -5,14 +5,14 @@ FROM solr:6.3.0 -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 - -ENV TERM "xterm" -ENV LANG "C.UTF-8" -ENV LC_ALL "C.UTF-8" +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 + +ENV TERM="xterm" \ + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" USER root diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 81041a766..9d09bea48 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -5,11 +5,11 @@ FROM webdevops/base:latest -ENV FTP_USER application -ENV FTP_PASSWORD application -ENV FTP_UID 1000 -ENV FTP_GID 1000 -ENV FTP_PATH /data/ftp/ +ENV FTP_USER=application \ + FTP_PASSWORD=application \ + FTP_UID=1000 \ + FTP_GID=1000 \ + FTP_PATH=/data/ftp/ COPY conf/ /opt/docker/ diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index ec5083b95..9e7a522ad 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -7,10 +7,10 @@ FROM {{ image }}:{{ tag }} {%- endmacro %} {% macro version() -%} -MAINTAINER info@webdevops.io -LABEL vendor=WebDevOps.io -LABEL io.webdevops.layout=8 -LABEL io.webdevops.version=1.5.0 +LABEL maintainer=info@webdevops.io \ + vendor=WebDevOps.io \ + io.webdevops.layout=8 \ + io.webdevops.version=1.5.0 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index ff1282d2f..cab5f53e0 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -1,60 +1,60 @@ {% macro general(charset="en_US.UTF-8") -%} -ENV TERM "xterm" -ENV LANG "{{ charset }}" -ENV LC_ALL "{{ charset }}" +ENV TERM="xterm" \ + LANG="{{ charset }}" \ + LC_ALL="{{ charset }}" {%- endmacro %} {% macro mailbox() -%} -ENV MAILBOX_USERNAME "dev" -ENV MAILBOX_PASSWORD "dev" +ENV MAILBOX_USERNAME="dev" \ + MAILBOX_PASSWORD="dev" {%- endmacro %} {% macro web() -%} -ENV WEB_DOCUMENT_ROOT /app -ENV WEB_DOCUMENT_INDEX index.php -ENV WEB_ALIAS_DOMAIN *.vm +ENV WEB_DOCUMENT_ROOT=/app \ + WEB_DOCUMENT_INDEX=index.php \ + WEB_ALIAS_DOMAIN=*.vm {%- endmacro %} {% macro webPhp() -%} -ENV WEB_PHP_SOCKET 127.0.0.1:9000 +ENV WEB_PHP_SOCKET=127.0.0.1:9000 {%- endmacro %} {% macro webDevelopment() -%} -ENV WEB_NO_CACHE_PATTERN "\.(css|js|gif|png|jpg|svg|json|xml)$" +ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" {%- endmacro %} {% macro ftp() -%} -ENV FTP_USER application -ENV FTP_PASSWORD application -ENV FTP_UID 1000 -ENV FTP_GID 1000 -ENV FTP_PATH /data/ftp/ +ENV FTP_USER=application \ + FTP_PASSWORD=application \ + FTP_UID=1000 \ + FTP_GID=1000 \ + FTP_PATH=/data/ftp/ {%- endmacro %} {% macro base() -%} -ENV DOCKER_CONF_HOME /opt/docker/ -ENV LOG_STDOUT "" -ENV LOG_STDERR "" +ENV DOCKER_CONF_HOME=/opt/docker/ \ + LOG_STDOUT="" \ + LOG_STDERR="" {%- endmacro %} {% macro baseApp() -%} -ENV APPLICATION_USER application -ENV APPLICATION_GROUP application -ENV APPLICATION_PATH /app -ENV APPLICATION_UID 1000 -ENV APPLICATION_GID 1000 +ENV APPLICATION_USER=application \ + APPLICATION_GROUP=application \ + APPLICATION_PATH=/app \ + APPLICATION_UID=1000 \ + APPLICATION_GID=1000 {%- endmacro %} {% macro liquibase(version, driver, classpath) -%} -ENV LIQUIBASE_VERSION "{{ version }}" -ENV LIQUIBASE_DRIVER "{{ driver }}" -ENV LIQUIBASE_CLASSPATH "{{ classpath }}" -ENV LIQUIBASE_URL "" -ENV LIQUIBASE_USERNAME "" -ENV LIQUIBASE_PASSWORD "" -ENV LIQUIBASE_CHANGELOG "liquibase.xml" -ENV LIQUIBASE_CONTEXTS "" -ENV LIQUIBASE_OPTS "" +ENV LIQUIBASE_VERSION="{{ version }}" \ + LIQUIBASE_DRIVER="{{ driver }}" \ + LIQUIBASE_CLASSPATH="{{ classpath }}" \ + LIQUIBASE_URL="" \ + LIQUIBASE_USERNAME="" \ + LIQUIBASE_PASSWORD="" \ + LIQUIBASE_CHANGELOG="liquibase.xml" \ + LIQUIBASE_CONTEXTS="" \ + LIQUIBASE_OPTS="" {%- endmacro %} From 1fc95c0a2b2735e9d366e047d122a3ac850fc11a Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:10:50 +0200 Subject: [PATCH 33/58] Cleanup and alpine renaming Fix some minor issues Renamed alpine-3-php7 to alpine-php7 --- docker/ansible/alpine/Dockerfile.jinja2 | 2 +- docker/apache-dev/alpine/Dockerfile.jinja2 | 2 +- docker/apache/alpine/Dockerfile.jinja2 | 2 +- docker/apache/alpine/Dockerfile.jinja2-e | 2 +- docker/base-app/alpine/Dockerfile.jinja2 | 2 +- docker/base/alpine/Dockerfile.jinja2 | 2 +- docker/certbot/latest/Dockerfile.jinja2 | 2 +- docker/nginx-dev/alpine/Dockerfile.jinja2 | 2 +- docker/nginx/alpine/Dockerfile.jinja2 | 2 +- docker/php-apache-dev/alpine-3-php7 | 1 + .../{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.d/12-development.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../roles/webdevops-apache-dev/defaults/main.yml | 0 .../roles/webdevops-apache-dev/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-apache-dev/tasks/main.yml | 0 .../provision/roles/webdevops-apache/defaults/main.yml | 0 .../provision/roles/webdevops-apache/tasks/bootstrap.yml | 0 .../conf/provision/roles/webdevops-apache/tasks/main.yml | 0 .../roles/webdevops-php-apache/defaults/main.yml | 0 .../roles/webdevops-php-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-php-apache/tasks/entrypoint.yml | 0 .../provision/roles/webdevops-php-apache/tasks/main.yml | 0 .../provision/roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-module.yml | 0 .../provision/roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-apache-dev/alpine/Dockerfile.jinja2 | 2 +- docker/php-apache/alpine-3-php7 | 1 + .../php-apache/{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../provision/roles/webdevops-apache/defaults/main.yml | 0 .../provision/roles/webdevops-apache/tasks/bootstrap.yml | 0 .../conf/provision/roles/webdevops-apache/tasks/main.yml | 0 .../roles/webdevops-php-apache/defaults/main.yml | 0 .../roles/webdevops-php-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-php-apache/tasks/entrypoint.yml | 0 .../provision/roles/webdevops-php-apache/tasks/main.yml | 0 docker/php-apache/alpine/Dockerfile.jinja2 | 2 +- docker/php-dev/alpine-3-php7 | 1 + docker/php-dev/{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../conf/provision/roles/webdevops-dev/defaults/main.yml | 0 .../provision/roles/webdevops-dev/tasks/bootstrap.yml | 0 .../conf/provision/roles/webdevops-dev/tasks/main.yml | 0 .../provision/roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-module.yml | 0 .../provision/roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-dev/alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/alpine-3-php7 | 1 + .../{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.d/12-development.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../conf/etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../roles/webdevops-nginx-dev/defaults/main.yml | 0 .../roles/webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml | 0 .../provision/roles/webdevops-nginx-dev/tasks/main.yml | 0 .../provision/roles/webdevops-nginx/defaults/main.yml | 0 .../provision/roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../conf/provision/roles/webdevops-nginx/tasks/main.yml | 0 .../provision/roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-module.yml | 0 .../provision/roles/webdevops-php-dev/tasks/main.yml | 0 .../roles/webdevops-php-nginx/defaults/main.yml | 0 .../roles/webdevops-php-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-php-nginx/tasks/entrypoint.yml | 0 .../provision/roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php-nginx-dev/alpine/Dockerfile.jinja2 | 2 +- docker/php-nginx/alpine-3-php7 | 1 + .../php-nginx/{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../conf/etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../provision/roles/webdevops-nginx/defaults/main.yml | 0 .../provision/roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../conf/provision/roles/webdevops-nginx/tasks/main.yml | 0 .../roles/webdevops-php-nginx/defaults/main.yml | 0 .../roles/webdevops-php-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-php-nginx/tasks/entrypoint.yml | 0 .../provision/roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php-nginx/alpine/Dockerfile.jinja2 | 2 +- docker/php/alpine-3-php7 | 1 + docker/php/{alpine-3-php7 => alpine-php7}/Dockerfile | 0 .../php/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 | 2 +- .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 0 .../conf/bin/service.d/php-fpm.sh | 0 .../conf/etc/logrotate.d/php5-fpm | 0 .../conf/etc/php/conf.d/.gitkeep | 0 .../conf/etc/php/fpm/php-fpm.conf | 0 .../conf/etc/php/fpm/pool.d/application.conf | 0 .../{alpine-3-php7 => alpine-php7}/conf/etc/php/php.ini | 0 .../conf/etc/php/php.webdevops.ini | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../conf/provision/roles/webdevops-php/defaults/main.yml | 0 .../provision/roles/webdevops-php/tasks/bootstrap.yml | 0 .../roles/webdevops-php/tasks/bootstrap/init.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php-fpm.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php.alpine.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php.debian.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php.redhat.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php.yml | 0 .../conf/provision/roles/webdevops-php/tasks/main.yml | 0 docker/php/alpine/Dockerfile.jinja2 | 2 +- docker/sphinx/latest/Dockerfile.jinja2 | 2 +- docker/varnish/latest/Dockerfile.jinja2 | 2 +- template/Dockerfile/environment.jinja2 | 8 +++++++- template/Dockerfile/images/base.jinja2 | 4 ---- template/Dockerfile/images/liquidsoap.jinja2 | 9 --------- template/Dockerfile/services.jinja2 | 1 + 218 files changed, 37 insertions(+), 37 deletions(-) create mode 120000 docker/php-apache-dev/alpine-3-php7 rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (82%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/global.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/main.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/php.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-apache-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-apache/alpine-3-php7 rename docker/php-apache/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (79%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/global.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/main.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/php.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) create mode 120000 docker/php-dev/alpine-3-php7 rename docker/php-dev/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (61%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-dev/tasks/main.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-nginx-dev/alpine-3-php7 rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (82%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx-dev/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php-nginx/alpine-3-php7 rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (79%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php/alpine-3-php7 rename docker/php/{alpine-3-php7 => alpine-php7}/Dockerfile (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/Dockerfile.jinja2 (73%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/php-fpm.d/11-clear-env.sh (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/bin/service.d/php-fpm.sh (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/logrotate.d/php5-fpm (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/php/conf.d/.gitkeep (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/php/fpm/php-fpm.conf (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/php/fpm/pool.d/application.conf (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/php/php.ini (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/php/php.webdevops.ini (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/defaults/main.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml (100%) rename docker/php/{alpine-3-php7 => alpine-php7}/conf/provision/roles/webdevops-php/tasks/main.yml (100%) diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 index 6e00c7797..a5a3ede42 100644 --- a/docker/ansible/alpine/Dockerfile.jinja2 +++ b/docker/ansible/alpine/Dockerfile.jinja2 @@ -1,3 +1,3 @@ -{{ docker.from("bootstrap", "alpine-3") }} +{{ docker.from("bootstrap", "alpine") }} {{ ansible.alpine() }} diff --git a/docker/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 index 258714d7d..7ce5b72cb 100644 --- a/docker/apache-dev/alpine/Dockerfile.jinja2 +++ b/docker/apache-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("apache", "alpine-3") }} +{{ docker.from("apache", "alpine") }} {{ environment.web() }} diff --git a/docker/apache/alpine/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 index d5091c019..c7872662f 100644 --- a/docker/apache/alpine/Dockerfile.jinja2 +++ b/docker/apache/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine-3") }} +{{ docker.from("base", "alpine") }} {{ environment.web() }} diff --git a/docker/apache/alpine/Dockerfile.jinja2-e b/docker/apache/alpine/Dockerfile.jinja2-e index d5091c019..c7872662f 100644 --- a/docker/apache/alpine/Dockerfile.jinja2-e +++ b/docker/apache/alpine/Dockerfile.jinja2-e @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine-3") }} +{{ docker.from("base", "alpine") }} {{ environment.web() }} diff --git a/docker/base-app/alpine/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 index c2321a737..a96521ef7 100644 --- a/docker/base-app/alpine/Dockerfile.jinja2 +++ b/docker/base-app/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine-3") }} +{{ docker.from("base", "alpine") }} {{ environment.baseApp() }} diff --git a/docker/base/alpine/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 index 204896571..7d9c25585 100644 --- a/docker/base/alpine/Dockerfile.jinja2 +++ b/docker/base/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap", "alpine-3") }} +{{ docker.from("bootstrap", "alpine") }} {{ environment.base() }} diff --git a/docker/certbot/latest/Dockerfile.jinja2 b/docker/certbot/latest/Dockerfile.jinja2 index e602246ef..59040cca3 100644 --- a/docker/certbot/latest/Dockerfile.jinja2 +++ b/docker/certbot/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("bootstrap","alpine-3") }} +{{ docker.from("bootstrap","alpine") }} {{ docker.volume('/etc/letsencrypt') }} {{ docker.volume('/var/www') }} diff --git a/docker/nginx-dev/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 index 0e4750f6c..587679251 100644 --- a/docker/nginx-dev/alpine/Dockerfile.jinja2 +++ b/docker/nginx-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("nginx", "alpine-3") }} +{{ docker.from("nginx", "alpine") }} {{ environment.web() }} diff --git a/docker/nginx/alpine/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 index dcf56b215..d0d65ed82 100644 --- a/docker/nginx/alpine/Dockerfile.jinja2 +++ b/docker/nginx/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base", "alpine-3") }} +{{ docker.from("base", "alpine") }} {{ environment.web() }} diff --git a/docker/php-apache-dev/alpine-3-php7 b/docker/php-apache-dev/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-php7/Dockerfile similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/Dockerfile rename to docker/php-apache-dev/alpine-php7/Dockerfile diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-php7/Dockerfile.jinja2 similarity index 82% rename from docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 rename to docker/php-apache-dev/alpine-php7/Dockerfile.jinja2 index 705090905..de5e8acbc 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine-3-php7") }} +{{ docker.from("php-dev", "alpine-php7") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-apache-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh rename to docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/httpd.sh rename to docker/php-apache-dev/alpine-php7/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/global.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/global.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/global.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/main.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/main.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/main.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/php.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/php.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/php.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.crt rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.csr rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/ssl/server.key rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/alpine-php7/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/supervisor.d/apache.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/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.opcache.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-apache-dev/alpine-php7/conf/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/main.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-apache-dev/alpine/Dockerfile.jinja2 b/docker/php-apache-dev/alpine/Dockerfile.jinja2 index 54b187e1b..cc42d96c7 100644 --- a/docker/php-apache-dev/alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine-3") }} +{{ docker.from("php-dev", "alpine") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/alpine-3-php7 b/docker/php-apache/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-apache/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-php7/Dockerfile similarity index 100% rename from docker/php-apache/alpine-3-php7/Dockerfile rename to docker/php-apache/alpine-php7/Dockerfile diff --git a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache/alpine-php7/Dockerfile.jinja2 similarity index 79% rename from docker/php-apache/alpine-3-php7/Dockerfile.jinja2 rename to docker/php-apache/alpine-php7/Dockerfile.jinja2 index ba496f6ff..06ecf33d2 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3-php7") }} +{{ docker.from("php", "alpine-php7") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-php7/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/alpine-php7/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.sh b/docker/php-apache/alpine-php7/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/bin/service.d/httpd.sh rename to docker/php-apache/alpine-php7/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/global.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/global.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/global.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/main.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/main.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/main.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/php.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/php.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/php.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.key b/docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/ssl/server.key rename to docker/php-apache/alpine-php7/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/alpine-php7/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/alpine-php7/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache/alpine-3-php7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/alpine-php7/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/alpine-php7/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine-3-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache/alpine-php7/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-apache/alpine/Dockerfile.jinja2 b/docker/php-apache/alpine/Dockerfile.jinja2 index 6e2aa839f..767944c03 100644 --- a/docker/php-apache/alpine/Dockerfile.jinja2 +++ b/docker/php-apache/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3") }} +{{ docker.from("php", "alpine") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/alpine-3-php7 b/docker/php-dev/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-dev/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-php7/Dockerfile similarity index 100% rename from docker/php-dev/alpine-3-php7/Dockerfile rename to docker/php-dev/alpine-php7/Dockerfile diff --git a/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-dev/alpine-php7/Dockerfile.jinja2 similarity index 61% rename from docker/php-dev/alpine-3-php7/Dockerfile.jinja2 rename to docker/php-dev/alpine-php7/Dockerfile.jinja2 index fee0283c1..8070a0dae 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-dev/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3-php7") }} +{{ docker.from("php", "alpine-php7") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/defaults/main.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/defaults/main.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-dev/tasks/main.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-dev/tasks/main.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-dev/alpine/Dockerfile.jinja2 b/docker/php-dev/alpine/Dockerfile.jinja2 index 52668dadc..298a76f38 100644 --- a/docker/php-dev/alpine/Dockerfile.jinja2 +++ b/docker/php-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3") }} +{{ docker.from("php", "alpine") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/alpine-3-php7 b/docker/php-nginx-dev/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-php7/Dockerfile similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/Dockerfile rename to docker/php-nginx-dev/alpine-php7/Dockerfile diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-php7/Dockerfile.jinja2 similarity index 82% rename from docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 rename to docker/php-nginx-dev/alpine-php7/Dockerfile.jinja2 index d166fca72..fb5e20418 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine-3-php7") }} +{{ docker.from("php-dev", "alpine-php7") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/alpine-php7/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/alpine-php7/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh rename to docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/nginx.sh rename to docker/php-nginx-dev/alpine-php7/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/global.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/global.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/global.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/main.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/main.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/main.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/nginx.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/nginx.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/php.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/php.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/ssl/server.key rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/alpine-php7/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx-dev/alpine-php7/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/alpine-php7/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/defaults/main.yml 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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/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.opcache.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.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-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine/Dockerfile.jinja2 index 3574af260..7dc805242 100644 --- a/docker/php-nginx-dev/alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine-3") }} +{{ docker.from("php-dev", "alpine") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/alpine-3-php7 b/docker/php-nginx/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-nginx/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-php7/Dockerfile similarity index 100% rename from docker/php-nginx/alpine-3-php7/Dockerfile rename to docker/php-nginx/alpine-php7/Dockerfile diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx/alpine-php7/Dockerfile.jinja2 similarity index 79% rename from docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 rename to docker/php-nginx/alpine-php7/Dockerfile.jinja2 index 1032009b4..c67f6e7da 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3-php7") }} +{{ docker.from("php", "alpine-php7") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-php7/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/alpine-php7/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.sh b/docker/php-nginx/alpine-php7/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/bin/service.d/nginx.sh rename to docker/php-nginx/alpine-php7/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/alpine-php7/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx/alpine-php7/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/global.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/global.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/global.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/main.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/main.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/nginx.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/nginx.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/php.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/php.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/php.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.key b/docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/ssl/server.key rename to docker/php-nginx/alpine-php7/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx/alpine-php7/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/alpine-php7/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/alpine-php7/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine-3-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx/alpine-php7/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine/Dockerfile.jinja2 b/docker/php-nginx/alpine/Dockerfile.jinja2 index 80664b37e..ade6a9fe9 100644 --- a/docker/php-nginx/alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine-3") }} +{{ docker.from("php", "alpine") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php/alpine-3-php7 b/docker/php/alpine-3-php7 new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php/alpine-3-php7 @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-php7/Dockerfile similarity index 100% rename from docker/php/alpine-3-php7/Dockerfile rename to docker/php/alpine-php7/Dockerfile diff --git a/docker/php/alpine-3-php7/Dockerfile.jinja2 b/docker/php/alpine-php7/Dockerfile.jinja2 similarity index 73% rename from docker/php/alpine-3-php7/Dockerfile.jinja2 rename to docker/php/alpine-php7/Dockerfile.jinja2 index f7b09fe82..808076d12 100644 --- a/docker/php/alpine-3-php7/Dockerfile.jinja2 +++ b/docker/php/alpine-php7/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base-app", "alpine-3") }} +{{ docker.from("base-app", "alpine") }} {{ environment.web() }} diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/alpine-php7/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/alpine-php7/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh similarity index 100% rename from docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php/alpine-php7/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-php7/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php/alpine-3-php7/conf/bin/service.d/php-fpm.sh rename to docker/php/alpine-php7/conf/bin/service.d/php-fpm.sh diff --git a/docker/php/alpine-3-php7/conf/etc/logrotate.d/php5-fpm b/docker/php/alpine-php7/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/logrotate.d/php5-fpm rename to docker/php/alpine-php7/conf/etc/logrotate.d/php5-fpm diff --git a/docker/php/alpine-3-php7/conf/etc/php/conf.d/.gitkeep b/docker/php/alpine-php7/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/php/conf.d/.gitkeep rename to docker/php/alpine-php7/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php/alpine-3-php7/conf/etc/php/fpm/php-fpm.conf b/docker/php/alpine-php7/conf/etc/php/fpm/php-fpm.conf similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/php/fpm/php-fpm.conf rename to docker/php/alpine-php7/conf/etc/php/fpm/php-fpm.conf diff --git a/docker/php/alpine-3-php7/conf/etc/php/fpm/pool.d/application.conf b/docker/php/alpine-php7/conf/etc/php/fpm/pool.d/application.conf similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/php/fpm/pool.d/application.conf rename to docker/php/alpine-php7/conf/etc/php/fpm/pool.d/application.conf diff --git a/docker/php/alpine-3-php7/conf/etc/php/php.ini b/docker/php/alpine-php7/conf/etc/php/php.ini similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/php/php.ini rename to docker/php/alpine-php7/conf/etc/php/php.ini diff --git a/docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini b/docker/php/alpine-php7/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/php/php.webdevops.ini rename to docker/php/alpine-php7/conf/etc/php/php.webdevops.ini diff --git a/docker/php/alpine-3-php7/conf/etc/supervisor.d/php-fpm.conf b/docker/php/alpine-php7/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php/alpine-3-php7/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/alpine-php7/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/defaults/main.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/defaults/main.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/defaults/main.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml diff --git a/docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/main.yml similarity index 100% rename from docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/main.yml rename to docker/php/alpine-php7/conf/provision/roles/webdevops-php/tasks/main.yml diff --git a/docker/php/alpine/Dockerfile.jinja2 b/docker/php/alpine/Dockerfile.jinja2 index b910e8ac4..48ad3cce1 100644 --- a/docker/php/alpine/Dockerfile.jinja2 +++ b/docker/php/alpine/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base-app", "alpine-3") }} +{{ docker.from("base-app", "alpine") }} {{ environment.web() }} diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 index 2ca8927cd..d68cfdc20 100644 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ b/docker/sphinx/latest/Dockerfile.jinja2 @@ -1,3 +1,3 @@ -{{ docker.from("bootstrap","alpine-3") }} +{{ docker.from("bootstrap","alpine") }} {{ sphinx.alpine() }} diff --git a/docker/varnish/latest/Dockerfile.jinja2 b/docker/varnish/latest/Dockerfile.jinja2 index 23c853522..be30c2d0f 100644 --- a/docker/varnish/latest/Dockerfile.jinja2 +++ b/docker/varnish/latest/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("base","alpine-3") }} +{{ docker.from("base","alpine") }} {{ varnish.env() }} diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index cab5f53e0..3db8567e3 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -4,25 +4,30 @@ ENV TERM="xterm" \ LC_ALL="{{ charset }}" {%- endmacro %} + {% macro mailbox() -%} ENV MAILBOX_USERNAME="dev" \ MAILBOX_PASSWORD="dev" {%- endmacro %} + {% macro web() -%} ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ WEB_ALIAS_DOMAIN=*.vm {%- endmacro %} + {% macro webPhp() -%} ENV WEB_PHP_SOCKET=127.0.0.1:9000 {%- endmacro %} + {% macro webDevelopment() -%} ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$" {%- endmacro %} + {% macro ftp() -%} ENV FTP_USER=application \ FTP_PASSWORD=application \ @@ -38,15 +43,16 @@ ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDERR="" {%- endmacro %} + {% macro baseApp() -%} ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ APPLICATION_PATH=/app \ APPLICATION_UID=1000 \ APPLICATION_GID=1000 - {%- endmacro %} + {% macro liquibase(version, driver, classpath) -%} ENV LIQUIBASE_VERSION="{{ version }}" \ LIQUIBASE_DRIVER="{{ driver }}" \ diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 54ddbd31a..808db028d 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -5,7 +5,6 @@ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ - python \ supervisor \ syslog-ng \ wget \ @@ -22,7 +21,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ - python \ supervisor \ syslog-ng \ wget \ @@ -39,7 +37,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ @@ -57,7 +54,6 @@ RUN chmod +x /opt/docker/bin/* \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/template/Dockerfile/images/liquidsoap.jinja2 b/template/Dockerfile/images/liquidsoap.jinja2 index 958e712ab..1502e93eb 100644 --- a/template/Dockerfile/images/liquidsoap.jinja2 +++ b/template/Dockerfile/images/liquidsoap.jinja2 @@ -7,12 +7,3 @@ RUN /usr/local/bin/apt-install \ liquidsoap \ {{ docker.cleanup() }} {%- endmacro %} - libasound2-plugins alsa-utils libcamomile-ocaml-dev file libsox-fmt-all - festival icecast2 liguidsoap liquidsoap-plugin-samplerate - liquidsoap-plugin-xmlplaylist mplayer perl-doc libterm-readline-gnu-perl - | libterm-readline-perl-perl make -Recommended packages: - liquidsoap-plugin-faad liquidsoap-plugin-flac liquidsoap-plugin-icecast - liquidsoap-plugin-lame liquidsoap-plugin-mad liquidsoap-plugin-pulseaudio - liquidsoap-plugin-taglib liquidsoap-plugin-voaacenc liquidsoap-plugin-vorbis - logrotate mp3gain vorbis-tools vorbisgain netbase rename diff --git a/template/Dockerfile/services.jinja2 b/template/Dockerfile/services.jinja2 index b7c56dd89..cdf08f4f2 100644 --- a/template/Dockerfile/services.jinja2 +++ b/template/Dockerfile/services.jinja2 @@ -3,6 +3,7 @@ && docker-service-enable cron {%- endmacro %} + {% macro phpDev() -%} # Enable php development services && docker-service-enable ssh \ From d8e2cccdad9318b57ed1bebc62f3900a7e89d579 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:12:11 +0200 Subject: [PATCH 34/58] Remove service check from bootstrap Script was moved to base --- tests/serverspec/spec/shared/bootstrap/layout.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/serverspec/spec/shared/bootstrap/layout.rb b/tests/serverspec/spec/shared/bootstrap/layout.rb index 99c63eb37..6058a80f3 100644 --- a/tests/serverspec/spec/shared/bootstrap/layout.rb +++ b/tests/serverspec/spec/shared/bootstrap/layout.rb @@ -40,7 +40,6 @@ "/usr/local/bin/apk-upgrade", "/usr/local/bin/apt-install", "/usr/local/bin/apt-upgrade", - "/usr/local/bin/service", "/usr/local/bin/yum-install", "/usr/local/bin/yum-upgrade", ].each do |file| From aac1c064dff6e1ace304e19598c6a6c92756490b Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:12:28 +0200 Subject: [PATCH 35/58] Add tests for new service scripts for base --- tests/serverspec/spec/shared/base/layout.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/serverspec/spec/shared/base/layout.rb b/tests/serverspec/spec/shared/base/layout.rb index e476a1c62..d73bb114e 100644 --- a/tests/serverspec/spec/shared/base/layout.rb +++ b/tests/serverspec/spec/shared/base/layout.rb @@ -98,6 +98,9 @@ "/opt/docker/bin/entrypoint.d/noop.sh", "/opt/docker/bin/entrypoint.d/root.sh", "/opt/docker/bin/entrypoint.d/supervisord.sh", + "/usr/local/bin/service", + "/usr/local/bin/docker-service-enable", + "/usr/local/bin/docker-service-disable", ].each do |file| describe file("#{file}") do # Type check From 7570ff88967d7f9f1028ce9c601c61d9dbfec7cf Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:17:05 +0200 Subject: [PATCH 36/58] Implement new alpine naming layout - alpine-php7 - alpine-php5 - alpine (symlink to alpine-php7; always latest version) - alpine-3 (symlink alpine-php5; deprecated) - alpine-3-php7 (symlink to alpine-php7; deprecated) --- docker/ansible/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../apache-dev/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/httpd.d/12-development.sh | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../roles/webdevops-apache-dev/defaults/main.yml | 0 .../roles/webdevops-apache-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-apache-dev/tasks/main.yml | 0 docker/apache/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2-e | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../{alpine => alpine-php5}/conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../roles/webdevops-apache/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-apache/tasks/main.yml | 0 docker/base-app/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../roles/webdevops-base-app/defaults/main.yml | 0 .../roles/webdevops-base-app/tasks/bootstrap.yml | 0 .../tasks/bootstrap/application.yml | 0 .../webdevops-base-app/tasks/bootstrap/user.yml | 0 .../roles/webdevops-base-app/tasks/main.yml | 0 docker/base/{alpine => alpine-php5}/Dockerfile | 0 .../base/{alpine => alpine-php5}/Dockerfile.jinja2 | 0 docker/base/{alpine => alpine-php5}/conf/VERSION | 0 .../{alpine => alpine-php5}/conf/bin/bootstrap.sh | 0 .../base/{alpine => alpine-php5}/conf/bin/config.sh | 0 .../{alpine => alpine-php5}/conf/bin/control.sh | 0 .../conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../conf/bin/entrypoint.d/noop.sh | 0 .../conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../{alpine => alpine-php5}/conf/bin/entrypoint.sh | 0 .../{alpine => alpine-php5}/conf/bin/logwatch.sh | 0 .../base/{alpine => alpine-php5}/conf/bin/provision | 0 .../{alpine => alpine-php5}/conf/bin/provision.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../conf/bin/service.d/ssh.sh | 0 .../conf/bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../conf/bin/usr-bin/service | 0 .../conf/etc/logrotate.d/syslog-ng | 0 .../conf/etc/supervisor.conf | 0 .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog-ng.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../roles/webdevops-base/defaults/main.yml | 0 .../roles/webdevops-base/tasks/bootstrap.yml | 0 .../roles/webdevops-base/tasks/bootstrap/misc.yml | 0 .../roles/webdevops-base/tasks/bootstrap/pam.yml | 0 .../roles/webdevops-base/tasks/bootstrap/root.yml | 0 .../webdevops-base/tasks/bootstrap/supervisor.yml | 0 .../webdevops-base/tasks/bootstrap/syslog-ng.yml | 0 .../roles/webdevops-base/tasks/bootstrap/system.yml | 0 .../provision/roles/webdevops-base/tasks/build.yml | 0 .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 0 .../roles/webdevops-base/tasks/entrypoint/.gitkeep | 0 .../provision/roles/webdevops-base/tasks/main.yml | 0 .../roles/webdevops-cleanup/tasks/cleanup.yml | 0 .../roles/webdevops-cleanup/tasks/main.yml | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/variables-webdevops.yml | 0 .../conf/provision/variables.yml | 0 docker/bootstrap/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../{alpine => alpine-php5}/baselayout.tar | Bin docker/nginx-dev/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/12-development.sh | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../roles/webdevops-nginx-dev/defaults/main.yml | 0 .../roles/webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../webdevops-nginx-dev/tasks/bootstrap/nginx.yml | 0 .../roles/webdevops-nginx-dev/tasks/main.yml | 0 docker/nginx/{alpine => alpine-php5}/Dockerfile | 0 .../nginx/{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../{alpine => alpine-php5}/conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-nginx/tasks/main.yml | 0 docker/php-apache-dev/alpine | 1 + docker/php-apache-dev/alpine-3 | 2 +- .../{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.d/12-development.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../{alpine => alpine-php5}/conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../roles/webdevops-apache-dev/defaults/main.yml | 0 .../roles/webdevops-apache-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-apache-dev/tasks/main.yml | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../roles/webdevops-apache/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-apache/tasks/main.yml | 0 .../roles/webdevops-php-apache/defaults/main.yml | 0 .../roles/webdevops-php-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-php-apache/tasks/entrypoint.yml | 0 .../roles/webdevops-php-apache/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-apache/alpine | 1 + docker/php-apache/alpine-3 | 2 +- .../php-apache/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../{alpine => alpine-php5}/conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../roles/webdevops-apache/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-apache/tasks/main.yml | 0 .../roles/webdevops-php-apache/defaults/main.yml | 0 .../roles/webdevops-php-apache/tasks/bootstrap.yml | 0 .../roles/webdevops-php-apache/tasks/entrypoint.yml | 0 .../roles/webdevops-php-apache/tasks/main.yml | 0 docker/php-dev/alpine | 1 + docker/php-dev/alpine-3 | 2 +- docker/php-dev/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../provision/roles/webdevops-dev/defaults/main.yml | 0 .../roles/webdevops-dev/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-dev/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 docker/php-nginx-dev/alpine | 1 + docker/php-nginx-dev/alpine-3 | 2 +- .../{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/blackfire-agent.d/10-init.sh | 0 .../conf/bin/service.d/blackfire-agent.sh | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.d/12-development.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../{alpine => alpine-php5}/conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/blackfire-agent.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../conf/provision/entrypoint.d/10-php-debugger.sh | 0 .../roles/webdevops-nginx-dev/defaults/main.yml | 0 .../roles/webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../webdevops-nginx-dev/tasks/bootstrap/nginx.yml | 0 .../roles/webdevops-nginx-dev/tasks/main.yml | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-nginx/tasks/main.yml | 0 .../roles/webdevops-php-dev/defaults/main.yml | 0 .../roles/webdevops-php-dev/tasks/bootstrap.yml | 0 .../webdevops-php-dev/tasks/bootstrap/php-fpm.yml | 0 .../tasks/bootstrap/php-module.blackfire.yml | 0 .../tasks/bootstrap/php-module.opcache.yml | 0 .../tasks/bootstrap/php-module.xdebug.yml | 0 .../tasks/bootstrap/php-module.yml | 0 .../roles/webdevops-php-dev/tasks/main.yml | 0 .../roles/webdevops-php-nginx/defaults/main.yml | 0 .../roles/webdevops-php-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-php-nginx/tasks/entrypoint.yml | 0 .../roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php-nginx/alpine | 1 + docker/php-nginx/alpine-3 | 2 +- docker/php-nginx/{alpine => alpine-php5}/Dockerfile | 0 .../{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../{alpine => alpine-php5}/conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-nginx/tasks/main.yml | 0 .../roles/webdevops-php-nginx/defaults/main.yml | 0 .../roles/webdevops-php-nginx/tasks/bootstrap.yml | 0 .../roles/webdevops-php-nginx/tasks/entrypoint.yml | 0 .../roles/webdevops-php-nginx/tasks/main.yml | 0 docker/php/alpine | 1 + docker/php/alpine-3 | 2 +- docker/php/{alpine => alpine-php5}/Dockerfile | 0 .../php/{alpine => alpine-php5}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/php-fpm.d/10-init.sh | 0 .../conf/bin/service.d/php-fpm.d/11-clear-env.sh | 0 .../conf/bin/service.d/php-fpm.sh | 0 .../conf/etc/logrotate.d/php5-fpm | 0 .../conf/etc/php/conf.d/.gitkeep | 0 .../conf/etc/php/fpm/php-fpm.conf | 0 .../conf/etc/php/fpm/pool.d/application.conf | 0 .../{alpine => alpine-php5}/conf/etc/php/php.ini | 0 .../conf/etc/php/php.webdevops.ini | 0 .../conf/etc/supervisor.d/php-fpm.conf | 0 .../provision/roles/webdevops-php/defaults/main.yml | 0 .../roles/webdevops-php/tasks/bootstrap.yml | 0 .../roles/webdevops-php/tasks/bootstrap/init.yml | 0 .../webdevops-php/tasks/bootstrap/php-fpm.main.yml | 0 .../webdevops-php/tasks/bootstrap/php-fpm.pool.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php-fpm.yml | 0 .../webdevops-php/tasks/bootstrap/php.alpine.yml | 0 .../webdevops-php/tasks/bootstrap/php.debian.yml | 0 .../webdevops-php/tasks/bootstrap/php.redhat.yml | 0 .../roles/webdevops-php/tasks/bootstrap/php.yml | 0 .../provision/roles/webdevops-php/tasks/main.yml | 0 354 files changed, 12 insertions(+), 6 deletions(-) rename docker/ansible/{alpine => alpine-php5}/Dockerfile (100%) rename docker/ansible/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/apache-dev/{alpine => alpine-php5}/Dockerfile (100%) rename docker/apache-dev/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) rename docker/apache/{alpine => alpine-php5}/Dockerfile (100%) rename docker/apache/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/apache/{alpine => alpine-php5}/Dockerfile.jinja2-e (100%) rename docker/apache/{alpine => alpine-php5}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/apache/{alpine => alpine-php5}/conf/bin/service.d/httpd.sh (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/global.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/main.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/php.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.crt (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.csr (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.key (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/etc/supervisor.d/apache.conf (100%) rename docker/apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/base-app/{alpine => alpine-php5}/Dockerfile (100%) rename docker/base-app/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/roles/webdevops-base-app/defaults/main.yml (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml (100%) rename docker/base-app/{alpine => alpine-php5}/conf/provision/roles/webdevops-base-app/tasks/main.yml (100%) rename docker/base/{alpine => alpine-php5}/Dockerfile (100%) rename docker/base/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/base/{alpine => alpine-php5}/conf/VERSION (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/bootstrap.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/config.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/control.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.d/cli.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.d/default.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.d/noop.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.d/root.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/entrypoint.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/logwatch.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/provision (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/provision.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/cron.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/dnsmasq.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/postfix.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/ssh.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/supervisor.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/service.d/syslog-ng.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/usr-bin/docker-service-disable (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/usr-bin/docker-service-enable (100%) rename docker/base/{alpine => alpine-php5}/conf/bin/usr-bin/service (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/logrotate.d/syslog-ng (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/cron.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/postfix.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/ssh.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/supervisor.d/syslog-ng.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/ansible.cfg (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/build.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/build.d/10-cleanup.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/defaults/main.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/build.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/build/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/entrypoint.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-base/tasks/main.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/roles/webdevops-cleanup/tasks/main.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/service.d/.gitkeep (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/service.d/cron.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/service.d/dnsmasq.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/service.d/postfix.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/service.d/ssh.sh (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/variables-webdevops.yml (100%) rename docker/base/{alpine => alpine-php5}/conf/provision/variables.yml (100%) rename docker/bootstrap/{alpine => alpine-php5}/Dockerfile (100%) rename docker/bootstrap/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/bootstrap/{alpine => alpine-php5}/baselayout.tar (100%) rename docker/nginx-dev/{alpine => alpine-php5}/Dockerfile (100%) rename docker/nginx-dev/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) rename docker/nginx/{alpine => alpine-php5}/Dockerfile (100%) rename docker/nginx/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/nginx/{alpine => alpine-php5}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/nginx/{alpine => alpine-php5}/conf/bin/service.d/nginx.sh (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/global.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/main.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/nginx.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/php.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.crt (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.csr (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.key (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) create mode 120000 docker/php-apache-dev/alpine rename docker/php-apache-dev/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/global.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/main.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/php.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-apache-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-apache/alpine rename docker/php-apache/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php-apache/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/bin/service.d/httpd.sh (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/global.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/main.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/php.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.crt (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.csr (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/ssl/server.key (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/etc/supervisor.d/apache.conf (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/defaults/main.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml (100%) rename docker/php-apache/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-apache/tasks/main.yml (100%) create mode 120000 docker/php-dev/alpine rename docker/php-dev/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php-dev/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-dev/tasks/main.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) create mode 120000 docker/php-nginx-dev/alpine rename docker/php-nginx-dev/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/blackfire-agent.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/supervisor.d/blackfire-agent.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/entrypoint.d/10-php-debugger.sh (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-dev/tasks/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx-dev/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php-nginx/alpine rename docker/php-nginx/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php-nginx/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/bin/service.d/nginx.sh (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/global.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/main.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/nginx.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/php.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.crt (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.csr (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/ssl/server.key (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/defaults/main.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml (100%) rename docker/php-nginx/{alpine => alpine-php5}/conf/provision/roles/webdevops-php-nginx/tasks/main.yml (100%) create mode 120000 docker/php/alpine rename docker/php/{alpine => alpine-php5}/Dockerfile (100%) rename docker/php/{alpine => alpine-php5}/Dockerfile.jinja2 (100%) rename docker/php/{alpine => alpine-php5}/conf/bin/service.d/php-fpm.d/10-init.sh (100%) rename docker/php/{alpine => alpine-php5}/conf/bin/service.d/php-fpm.d/11-clear-env.sh (100%) rename docker/php/{alpine => alpine-php5}/conf/bin/service.d/php-fpm.sh (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/logrotate.d/php5-fpm (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/php/conf.d/.gitkeep (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/php/fpm/php-fpm.conf (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/php/fpm/pool.d/application.conf (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/php/php.ini (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/php/php.webdevops.ini (100%) rename docker/php/{alpine => alpine-php5}/conf/etc/supervisor.d/php-fpm.conf (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/defaults/main.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml (100%) rename docker/php/{alpine => alpine-php5}/conf/provision/roles/webdevops-php/tasks/main.yml (100%) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine-php5/Dockerfile similarity index 100% rename from docker/ansible/alpine/Dockerfile rename to docker/ansible/alpine-php5/Dockerfile diff --git a/docker/ansible/alpine/Dockerfile.jinja2 b/docker/ansible/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/ansible/alpine/Dockerfile.jinja2 rename to docker/ansible/alpine-php5/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine-php5/Dockerfile similarity index 100% rename from docker/apache-dev/alpine/Dockerfile rename to docker/apache-dev/alpine-php5/Dockerfile diff --git a/docker/apache-dev/alpine/Dockerfile.jinja2 b/docker/apache-dev/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/apache-dev/alpine/Dockerfile.jinja2 rename to docker/apache-dev/alpine-php5/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine-php5/Dockerfile similarity index 100% rename from docker/apache/alpine/Dockerfile rename to docker/apache/alpine-php5/Dockerfile diff --git a/docker/apache/alpine/Dockerfile.jinja2 b/docker/apache/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/apache/alpine/Dockerfile.jinja2 rename to docker/apache/alpine-php5/Dockerfile.jinja2 diff --git a/docker/apache/alpine/Dockerfile.jinja2-e b/docker/apache/alpine-php5/Dockerfile.jinja2-e similarity index 100% rename from docker/apache/alpine/Dockerfile.jinja2-e rename to docker/apache/alpine-php5/Dockerfile.jinja2-e diff --git a/docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh rename to docker/apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/alpine/conf/bin/service.d/httpd.sh b/docker/apache/alpine-php5/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/alpine/conf/bin/service.d/httpd.sh rename to docker/apache/alpine-php5/conf/bin/service.d/httpd.sh diff --git a/docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep rename to docker/apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf rename to docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf rename to docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf rename to docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/alpine/conf/etc/httpd/global.conf b/docker/apache/alpine-php5/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/global.conf rename to docker/apache/alpine-php5/conf/etc/httpd/global.conf diff --git a/docker/apache/alpine/conf/etc/httpd/main.conf b/docker/apache/alpine-php5/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/main.conf rename to docker/apache/alpine-php5/conf/etc/httpd/main.conf diff --git a/docker/apache/alpine/conf/etc/httpd/php.conf b/docker/apache/alpine-php5/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/php.conf rename to docker/apache/alpine-php5/conf/etc/httpd/php.conf diff --git a/docker/apache/alpine/conf/etc/httpd/ssl/server.crt b/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/ssl/server.crt rename to docker/apache/alpine-php5/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/alpine/conf/etc/httpd/ssl/server.csr b/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/ssl/server.csr rename to docker/apache/alpine-php5/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/alpine/conf/etc/httpd/ssl/server.key b/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/ssl/server.key rename to docker/apache/alpine-php5/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/alpine/conf/etc/httpd/vhost.common.conf b/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/vhost.common.conf rename to docker/apache/alpine-php5/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/alpine/conf/etc/httpd/vhost.conf b/docker/apache/alpine-php5/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/vhost.conf rename to docker/apache/alpine-php5/conf/etc/httpd/vhost.conf diff --git a/docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf b/docker/apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf rename to docker/apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/alpine/conf/etc/supervisor.d/apache.conf b/docker/apache/alpine-php5/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/alpine/conf/etc/supervisor.d/apache.conf rename to docker/apache/alpine-php5/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine-php5/Dockerfile similarity index 100% rename from docker/base-app/alpine/Dockerfile rename to docker/base-app/alpine-php5/Dockerfile diff --git a/docker/base-app/alpine/Dockerfile.jinja2 b/docker/base-app/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/base-app/alpine/Dockerfile.jinja2 rename to docker/base-app/alpine-php5/Dockerfile.jinja2 diff --git a/docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep b/docker/base-app/alpine-php5/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep rename to docker/base-app/alpine-php5/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/defaults/main.yml similarity index 100% rename from docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml rename to docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/defaults/main.yml diff --git a/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml similarity index 100% rename from docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml rename to docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml diff --git a/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml similarity index 100% rename from docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml rename to docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml diff --git a/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml similarity index 100% rename from docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml rename to docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml diff --git a/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/main.yml similarity index 100% rename from docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml rename to docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/main.yml diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine-php5/Dockerfile similarity index 100% rename from docker/base/alpine/Dockerfile rename to docker/base/alpine-php5/Dockerfile diff --git a/docker/base/alpine/Dockerfile.jinja2 b/docker/base/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/base/alpine/Dockerfile.jinja2 rename to docker/base/alpine-php5/Dockerfile.jinja2 diff --git a/docker/base/alpine/conf/VERSION b/docker/base/alpine-php5/conf/VERSION similarity index 100% rename from docker/base/alpine/conf/VERSION rename to docker/base/alpine-php5/conf/VERSION diff --git a/docker/base/alpine/conf/bin/bootstrap.sh b/docker/base/alpine-php5/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/alpine/conf/bin/bootstrap.sh rename to docker/base/alpine-php5/conf/bin/bootstrap.sh diff --git a/docker/base/alpine/conf/bin/config.sh b/docker/base/alpine-php5/conf/bin/config.sh similarity index 100% rename from docker/base/alpine/conf/bin/config.sh rename to docker/base/alpine-php5/conf/bin/config.sh diff --git a/docker/base/alpine/conf/bin/control.sh b/docker/base/alpine-php5/conf/bin/control.sh similarity index 100% rename from docker/base/alpine/conf/bin/control.sh rename to docker/base/alpine-php5/conf/bin/control.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.d/cli.sh b/docker/base/alpine-php5/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.d/cli.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.d/default.sh b/docker/base/alpine-php5/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.d/default.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.d/noop.sh b/docker/base/alpine-php5/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.d/noop.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.d/root.sh b/docker/base/alpine-php5/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.d/root.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/base/alpine-php5/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.sh b/docker/base/alpine-php5/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/alpine/conf/bin/entrypoint.sh rename to docker/base/alpine-php5/conf/bin/entrypoint.sh diff --git a/docker/base/alpine/conf/bin/logwatch.sh b/docker/base/alpine-php5/conf/bin/logwatch.sh similarity index 100% rename from docker/base/alpine/conf/bin/logwatch.sh rename to docker/base/alpine-php5/conf/bin/logwatch.sh diff --git a/docker/base/alpine/conf/bin/provision b/docker/base/alpine-php5/conf/bin/provision similarity index 100% rename from docker/base/alpine/conf/bin/provision rename to docker/base/alpine-php5/conf/bin/provision diff --git a/docker/base/alpine/conf/bin/provision.sh b/docker/base/alpine-php5/conf/bin/provision.sh similarity index 100% rename from docker/base/alpine/conf/bin/provision.sh rename to docker/base/alpine-php5/conf/bin/provision.sh diff --git a/docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/cron.sh b/docker/base/alpine-php5/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/cron.sh rename to docker/base/alpine-php5/conf/bin/service.d/cron.sh diff --git a/docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/dnsmasq.sh b/docker/base/alpine-php5/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/dnsmasq.sh rename to docker/base/alpine-php5/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/postfix.sh b/docker/base/alpine-php5/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/postfix.sh rename to docker/base/alpine-php5/conf/bin/service.d/postfix.sh diff --git a/docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/ssh.sh b/docker/base/alpine-php5/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/ssh.sh rename to docker/base/alpine-php5/conf/bin/service.d/ssh.sh diff --git a/docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/supervisor.sh b/docker/base/alpine-php5/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/supervisor.sh rename to docker/base/alpine-php5/conf/bin/service.d/supervisor.sh diff --git a/docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/alpine-php5/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/base/alpine-php5/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/alpine/conf/bin/service.d/syslog-ng.sh b/docker/base/alpine-php5/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/alpine/conf/bin/service.d/syslog-ng.sh rename to docker/base/alpine-php5/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/alpine/conf/bin/usr-bin/docker-service-disable b/docker/base/alpine-php5/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/alpine/conf/bin/usr-bin/docker-service-disable rename to docker/base/alpine-php5/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/alpine/conf/bin/usr-bin/docker-service-enable b/docker/base/alpine-php5/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/alpine/conf/bin/usr-bin/docker-service-enable rename to docker/base/alpine-php5/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/alpine/conf/bin/usr-bin/service b/docker/base/alpine-php5/conf/bin/usr-bin/service similarity index 100% rename from docker/base/alpine/conf/bin/usr-bin/service rename to docker/base/alpine-php5/conf/bin/usr-bin/service diff --git a/docker/base/alpine/conf/etc/logrotate.d/syslog-ng b/docker/base/alpine-php5/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/alpine/conf/etc/logrotate.d/syslog-ng rename to docker/base/alpine-php5/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/alpine/conf/etc/supervisor.conf b/docker/base/alpine-php5/conf/etc/supervisor.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.conf rename to docker/base/alpine-php5/conf/etc/supervisor.conf diff --git a/docker/base/alpine/conf/etc/supervisor.d/.gitkeep b/docker/base/alpine-php5/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/.gitkeep rename to docker/base/alpine-php5/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/alpine/conf/etc/supervisor.d/cron.conf b/docker/base/alpine-php5/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/cron.conf rename to docker/base/alpine-php5/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/alpine-php5/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/alpine-php5/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/base/alpine/conf/etc/supervisor.d/postfix.conf b/docker/base/alpine-php5/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/postfix.conf rename to docker/base/alpine-php5/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/alpine/conf/etc/supervisor.d/ssh.conf b/docker/base/alpine-php5/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/ssh.conf rename to docker/base/alpine-php5/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/alpine-php5/conf/etc/supervisor.d/syslog-ng.conf similarity index 100% rename from docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/alpine-php5/conf/etc/supervisor.d/syslog-ng.conf diff --git a/docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/alpine-php5/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf rename to docker/base/alpine-php5/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/alpine/conf/provision/ansible.cfg b/docker/base/alpine-php5/conf/provision/ansible.cfg similarity index 100% rename from docker/base/alpine/conf/provision/ansible.cfg rename to docker/base/alpine-php5/conf/provision/ansible.cfg diff --git a/docker/base/alpine/conf/provision/bootstrap.d/.gitkeep b/docker/base/alpine-php5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/bootstrap.d/.gitkeep rename to docker/base/alpine-php5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/alpine/conf/provision/build.d/.gitkeep b/docker/base/alpine-php5/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/build.d/.gitkeep rename to docker/base/alpine-php5/conf/provision/build.d/.gitkeep diff --git a/docker/base/alpine/conf/provision/build.d/10-cleanup.sh b/docker/base/alpine-php5/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/alpine/conf/provision/build.d/10-cleanup.sh rename to docker/base/alpine-php5/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/alpine/conf/provision/entrypoint.d/.gitkeep b/docker/base/alpine-php5/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/entrypoint.d/.gitkeep rename to docker/base/alpine-php5/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/alpine-php5/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh rename to docker/base/alpine-php5/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/base/alpine/conf/provision/onbuild.d/.gitkeep b/docker/base/alpine-php5/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/onbuild.d/.gitkeep rename to docker/base/alpine-php5/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/defaults/main.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/defaults/main.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build/.gitkeep diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/main.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/main.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/main.yml similarity index 100% rename from docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml rename to docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/main.yml diff --git a/docker/base/alpine/conf/provision/service.d/.gitkeep b/docker/base/alpine-php5/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/alpine/conf/provision/service.d/.gitkeep rename to docker/base/alpine-php5/conf/provision/service.d/.gitkeep diff --git a/docker/base/alpine/conf/provision/service.d/cron.sh b/docker/base/alpine-php5/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/alpine/conf/provision/service.d/cron.sh rename to docker/base/alpine-php5/conf/provision/service.d/cron.sh diff --git a/docker/base/alpine/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine-php5/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine/conf/provision/service.d/dnsmasq.sh rename to docker/base/alpine-php5/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/alpine/conf/provision/service.d/postfix.sh b/docker/base/alpine-php5/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/alpine/conf/provision/service.d/postfix.sh rename to docker/base/alpine-php5/conf/provision/service.d/postfix.sh diff --git a/docker/base/alpine/conf/provision/service.d/ssh.sh b/docker/base/alpine-php5/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/alpine/conf/provision/service.d/ssh.sh rename to docker/base/alpine-php5/conf/provision/service.d/ssh.sh diff --git a/docker/base/alpine/conf/provision/variables-webdevops.yml b/docker/base/alpine-php5/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/alpine/conf/provision/variables-webdevops.yml rename to docker/base/alpine-php5/conf/provision/variables-webdevops.yml diff --git a/docker/base/alpine/conf/provision/variables.yml b/docker/base/alpine-php5/conf/provision/variables.yml similarity index 100% rename from docker/base/alpine/conf/provision/variables.yml rename to docker/base/alpine-php5/conf/provision/variables.yml diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine-php5/Dockerfile similarity index 100% rename from docker/bootstrap/alpine/Dockerfile rename to docker/bootstrap/alpine-php5/Dockerfile diff --git a/docker/bootstrap/alpine/Dockerfile.jinja2 b/docker/bootstrap/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/bootstrap/alpine/Dockerfile.jinja2 rename to docker/bootstrap/alpine-php5/Dockerfile.jinja2 diff --git a/docker/bootstrap/alpine/baselayout.tar b/docker/bootstrap/alpine-php5/baselayout.tar similarity index 100% rename from docker/bootstrap/alpine/baselayout.tar rename to docker/bootstrap/alpine-php5/baselayout.tar diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine-php5/Dockerfile similarity index 100% rename from docker/nginx-dev/alpine/Dockerfile rename to docker/nginx-dev/alpine-php5/Dockerfile diff --git a/docker/nginx-dev/alpine/Dockerfile.jinja2 b/docker/nginx-dev/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/nginx-dev/alpine/Dockerfile.jinja2 rename to docker/nginx-dev/alpine-php5/Dockerfile.jinja2 diff --git a/docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine-php5/Dockerfile similarity index 100% rename from docker/nginx/alpine/Dockerfile rename to docker/nginx/alpine-php5/Dockerfile diff --git a/docker/nginx/alpine/Dockerfile.jinja2 b/docker/nginx/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/nginx/alpine/Dockerfile.jinja2 rename to docker/nginx/alpine-php5/Dockerfile.jinja2 diff --git a/docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh rename to docker/nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/alpine/conf/bin/service.d/nginx.sh b/docker/nginx/alpine-php5/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/alpine/conf/bin/service.d/nginx.sh rename to docker/nginx/alpine-php5/conf/bin/service.d/nginx.sh diff --git a/docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep rename to docker/nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/global.conf b/docker/nginx/alpine-php5/conf/etc/nginx/global.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/global.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/global.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/main.conf b/docker/nginx/alpine-php5/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/main.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/main.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/nginx.conf b/docker/nginx/alpine-php5/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/nginx.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/nginx.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/php.conf b/docker/nginx/alpine-php5/conf/etc/nginx/php.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/php.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/php.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/ssl/server.crt b/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/ssl/server.crt rename to docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.crt diff --git a/docker/nginx/alpine/conf/etc/nginx/ssl/server.csr b/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/ssl/server.csr rename to docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.csr diff --git a/docker/nginx/alpine/conf/etc/nginx/ssl/server.key b/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/ssl/server.key rename to docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.conf diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf rename to docker/nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf b/docker/nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf rename to docker/nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf diff --git a/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-apache-dev/alpine b/docker/php-apache-dev/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-apache-dev/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-apache-dev/alpine-3 b/docker/php-apache-dev/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php-apache-dev/alpine-3 +++ b/docker/php-apache-dev/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php-apache-dev/alpine/Dockerfile b/docker/php-apache-dev/alpine-php5/Dockerfile similarity index 100% rename from docker/php-apache-dev/alpine/Dockerfile rename to docker/php-apache-dev/alpine-php5/Dockerfile diff --git a/docker/php-apache-dev/alpine/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php-apache-dev/alpine/Dockerfile.jinja2 rename to docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-apache-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-apache-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh rename to docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/php-apache-dev/alpine/conf/bin/service.d/httpd.sh b/docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/bin/service.d/httpd.sh rename to docker/php-apache-dev/alpine-php5/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/global.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/global.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/global.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/main.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/main.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/main.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/php.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/php.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/php.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.crt rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.csr rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/ssl/server.key rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache-dev/alpine-php5/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/supervisor.d/apache.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-apache-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-apache/alpine b/docker/php-apache/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-apache/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-apache/alpine-3 b/docker/php-apache/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php-apache/alpine-3 +++ b/docker/php-apache/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php-apache/alpine/Dockerfile b/docker/php-apache/alpine-php5/Dockerfile similarity index 100% rename from docker/php-apache/alpine/Dockerfile rename to docker/php-apache/alpine-php5/Dockerfile diff --git a/docker/php-apache/alpine/Dockerfile.jinja2 b/docker/php-apache/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php-apache/alpine/Dockerfile.jinja2 rename to docker/php-apache/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php-apache/alpine/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/php-apache/alpine/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/alpine-php5/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/alpine/conf/bin/service.d/httpd.sh rename to docker/php-apache/alpine-php5/conf/bin/service.d/httpd.sh diff --git a/docker/php-apache/alpine/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/global.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/global.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/global.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/global.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/main.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/main.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/main.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/main.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/php.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/php.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/php.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/php.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/ssl/server.crt b/docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.crt diff --git a/docker/php-apache/alpine/conf/etc/httpd/ssl/server.csr b/docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.csr diff --git a/docker/php-apache/alpine/conf/etc/httpd/ssl/server.key b/docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/ssl/server.key rename to docker/php-apache/alpine-php5/conf/etc/httpd/ssl/server.key diff --git a/docker/php-apache/alpine/conf/etc/httpd/vhost.common.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/vhost.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/vhost.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/vhost.conf diff --git a/docker/php-apache/alpine/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/php-apache/alpine/conf/etc/supervisor.d/apache.conf b/docker/php-apache/alpine-php5/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/php-apache/alpine/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/alpine-php5/conf/etc/supervisor.d/apache.conf diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/defaults/main.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/defaults/main.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/defaults/main.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/bootstrap.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/entrypoint.yml diff --git a/docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/main.yml similarity index 100% rename from docker/php-apache/alpine/conf/provision/roles/webdevops-php-apache/tasks/main.yml rename to docker/php-apache/alpine-php5/conf/provision/roles/webdevops-php-apache/tasks/main.yml diff --git a/docker/php-dev/alpine b/docker/php-dev/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-dev/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-dev/alpine-3 b/docker/php-dev/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php-dev/alpine-3 +++ b/docker/php-dev/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php-dev/alpine/Dockerfile b/docker/php-dev/alpine-php5/Dockerfile similarity index 100% rename from docker/php-dev/alpine/Dockerfile rename to docker/php-dev/alpine-php5/Dockerfile diff --git a/docker/php-dev/alpine/Dockerfile.jinja2 b/docker/php-dev/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php-dev/alpine/Dockerfile.jinja2 rename to docker/php-dev/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-dev/alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/defaults/main.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-dev/defaults/main.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/defaults/main.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/main.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-dev/tasks/main.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-dev/tasks/main.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine b/docker/php-nginx-dev/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-nginx-dev/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine-3 b/docker/php-nginx-dev/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php-nginx-dev/alpine-3 +++ b/docker/php-nginx-dev/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php-nginx-dev/alpine/Dockerfile b/docker/php-nginx-dev/alpine-php5/Dockerfile similarity index 100% rename from docker/php-nginx-dev/alpine/Dockerfile rename to docker/php-nginx-dev/alpine-php5/Dockerfile diff --git a/docker/php-nginx-dev/alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php-nginx-dev/alpine/Dockerfile.jinja2 rename to docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-nginx-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/alpine-php5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/alpine-php5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh rename to docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/bin/service.d/nginx.sh rename to docker/php-nginx-dev/alpine-php5/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/global.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/global.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/global.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/main.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/main.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/main.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/nginx.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/php.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/php.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/php.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/ssl/server.key rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-nginx-dev/alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx-dev/alpine-php5/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx-dev/alpine/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx-dev/alpine-php5/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/alpine-php5/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/defaults/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-fpm.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.opcache.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.xdebug.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-dev/tasks/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx-dev/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine b/docker/php-nginx/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php-nginx/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php-nginx/alpine-3 b/docker/php-nginx/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php-nginx/alpine-3 +++ b/docker/php-nginx/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php-nginx/alpine/Dockerfile b/docker/php-nginx/alpine-php5/Dockerfile similarity index 100% rename from docker/php-nginx/alpine/Dockerfile rename to docker/php-nginx/alpine-php5/Dockerfile diff --git a/docker/php-nginx/alpine/Dockerfile.jinja2 b/docker/php-nginx/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php-nginx/alpine/Dockerfile.jinja2 rename to docker/php-nginx/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php-nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/php-nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/php-nginx/alpine/conf/bin/service.d/nginx.sh b/docker/php-nginx/alpine-php5/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/php-nginx/alpine/conf/bin/service.d/nginx.sh rename to docker/php-nginx/alpine-php5/conf/bin/service.d/nginx.sh diff --git a/docker/php-nginx/alpine/conf/etc/nginx/conf.d/.gitkeep b/docker/php-nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/conf.d/.gitkeep rename to docker/php-nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/php-nginx/alpine/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/global.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/global.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/global.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/global.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/main.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/main.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/main.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/nginx.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/nginx.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/php.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/php.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/php.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/php.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.crt b/docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/ssl/server.crt rename to docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.crt diff --git a/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.csr b/docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/ssl/server.csr rename to docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.csr diff --git a/docker/php-nginx/alpine/conf/etc/nginx/ssl/server.key b/docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/ssl/server.key rename to docker/php-nginx/alpine-php5/conf/etc/nginx/ssl/server.key diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.conf diff --git a/docker/php-nginx/alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/nginx/vhost.ssl.conf rename to docker/php-nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/php-nginx/alpine/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/php-nginx/alpine/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/defaults/main.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/defaults/main.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/defaults/main.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/bootstrap.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/entrypoint.yml diff --git a/docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml b/docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/main.yml similarity index 100% rename from docker/php-nginx/alpine/conf/provision/roles/webdevops-php-nginx/tasks/main.yml rename to docker/php-nginx/alpine-php5/conf/provision/roles/webdevops-php-nginx/tasks/main.yml diff --git a/docker/php/alpine b/docker/php/alpine new file mode 120000 index 000000000..a5e678cb6 --- /dev/null +++ b/docker/php/alpine @@ -0,0 +1 @@ +alpine-php7 \ No newline at end of file diff --git a/docker/php/alpine-3 b/docker/php/alpine-3 index 0120374ca..a84cfe247 120000 --- a/docker/php/alpine-3 +++ b/docker/php/alpine-3 @@ -1 +1 @@ -alpine \ No newline at end of file +alpine-php5 \ No newline at end of file diff --git a/docker/php/alpine/Dockerfile b/docker/php/alpine-php5/Dockerfile similarity index 100% rename from docker/php/alpine/Dockerfile rename to docker/php/alpine-php5/Dockerfile diff --git a/docker/php/alpine/Dockerfile.jinja2 b/docker/php/alpine-php5/Dockerfile.jinja2 similarity index 100% rename from docker/php/alpine/Dockerfile.jinja2 rename to docker/php/alpine-php5/Dockerfile.jinja2 diff --git a/docker/php/alpine/conf/bin/service.d/php-fpm.d/10-init.sh b/docker/php/alpine-php5/conf/bin/service.d/php-fpm.d/10-init.sh similarity index 100% rename from docker/php/alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php/alpine-php5/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php/alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh b/docker/php/alpine-php5/conf/bin/service.d/php-fpm.d/11-clear-env.sh similarity index 100% rename from docker/php/alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php/alpine-php5/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php/alpine/conf/bin/service.d/php-fpm.sh b/docker/php/alpine-php5/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php/alpine/conf/bin/service.d/php-fpm.sh rename to docker/php/alpine-php5/conf/bin/service.d/php-fpm.sh diff --git a/docker/php/alpine/conf/etc/logrotate.d/php5-fpm b/docker/php/alpine-php5/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php/alpine/conf/etc/logrotate.d/php5-fpm rename to docker/php/alpine-php5/conf/etc/logrotate.d/php5-fpm diff --git a/docker/php/alpine/conf/etc/php/conf.d/.gitkeep b/docker/php/alpine-php5/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/php/alpine/conf/etc/php/conf.d/.gitkeep rename to docker/php/alpine-php5/conf/etc/php/conf.d/.gitkeep diff --git a/docker/php/alpine/conf/etc/php/fpm/php-fpm.conf b/docker/php/alpine-php5/conf/etc/php/fpm/php-fpm.conf similarity index 100% rename from docker/php/alpine/conf/etc/php/fpm/php-fpm.conf rename to docker/php/alpine-php5/conf/etc/php/fpm/php-fpm.conf diff --git a/docker/php/alpine/conf/etc/php/fpm/pool.d/application.conf b/docker/php/alpine-php5/conf/etc/php/fpm/pool.d/application.conf similarity index 100% rename from docker/php/alpine/conf/etc/php/fpm/pool.d/application.conf rename to docker/php/alpine-php5/conf/etc/php/fpm/pool.d/application.conf diff --git a/docker/php/alpine/conf/etc/php/php.ini b/docker/php/alpine-php5/conf/etc/php/php.ini similarity index 100% rename from docker/php/alpine/conf/etc/php/php.ini rename to docker/php/alpine-php5/conf/etc/php/php.ini diff --git a/docker/php/alpine/conf/etc/php/php.webdevops.ini b/docker/php/alpine-php5/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php/alpine/conf/etc/php/php.webdevops.ini rename to docker/php/alpine-php5/conf/etc/php/php.webdevops.ini diff --git a/docker/php/alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php/alpine-php5/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php/alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php/alpine-php5/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/defaults/main.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/defaults/main.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/defaults/main.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/defaults/main.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/init.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.alpine.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.debian.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.redhat.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml diff --git a/docker/php/alpine/conf/provision/roles/webdevops-php/tasks/main.yml b/docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/main.yml similarity index 100% rename from docker/php/alpine/conf/provision/roles/webdevops-php/tasks/main.yml rename to docker/php/alpine-php5/conf/provision/roles/webdevops-php/tasks/main.yml From 04c2c9bb261cf462e3efeaae0f760852250ab090 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:45:24 +0200 Subject: [PATCH 37/58] Add alpine to php tag list --- .../DockerImages/dockerfiles/include/image-tag-php.rst | 5 +++++ 1 file changed, 5 insertions(+) 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 b295a3401..3512ce3fe 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -1,6 +1,11 @@ ====================== ========================== =============== Tag Distribution name PHP Version ====================== ========================== =============== +``alpine`` *link to alpine-php7* PHP 7.x +``alpine-php7`` PHP 7.x +``alpine-php5`` PHP 5.6 +``alpine-3`` *deprecated* PHP 5.6 +``alpine-3-php7`` *deprecated* PHP 7.x ``ubuntu-12.04`` precise PHP 5.3 ``ubuntu-14.04`` trusty (LTS) PHP 5.5 ``ubuntu-15.04`` vivid PHP 5.6 From ce67b4eb1f24efb4dead76b8318a64333bb317db Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:45:43 +0200 Subject: [PATCH 38/58] Move documentation port to 8000 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 962f2ef84..1ba89c7e4 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ graph-full: python ./bin/console generate:graph --all --filename docker-image-full-layout.gv documentation: - docker run -t -i --rm -p 8080:8000 -v "$$(pwd)/documentation/docs/:/opt/docs" -e "VIRTUAL_HOST=documentation.docker" -e "VIRTUAL_PORT=8000" webdevops/sphinx sphinx-autobuild --poll -H 0.0.0.0 /opt/docs html + docker run -t -i --rm -p 8000 -v "$$(pwd)/documentation/docs/:/opt/docs" -e "VIRTUAL_HOST=documentation.docker" -e "VIRTUAL_PORT=8000" webdevops/sphinx sphinx-autobuild --poll -H 0.0.0.0 /opt/docs html webdevops/bootstrap: python ./bin/console docker:build --threads=auto --whitelist=webdevops/bootstrap From 85fd3bc6872a71a1cd16f66cd72ca87c97437e60 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 00:55:24 +0200 Subject: [PATCH 39/58] Add official php images to tag list --- .../dockerfiles/include/image-tag-php.rst | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) 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 3512ce3fe..2cbd7f09a 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -1,20 +1,23 @@ -====================== ========================== =============== -Tag Distribution name PHP Version -====================== ========================== =============== -``alpine`` *link to alpine-php7* PHP 7.x -``alpine-php7`` PHP 7.x -``alpine-php5`` PHP 5.6 -``alpine-3`` *deprecated* PHP 5.6 -``alpine-3-php7`` *deprecated* PHP 7.x -``ubuntu-12.04`` precise PHP 5.3 -``ubuntu-14.04`` trusty (LTS) PHP 5.5 -``ubuntu-15.04`` vivid PHP 5.6 -``ubuntu-15.10`` wily PHP 5.6 -``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 sury) -``debian-9`` stretch PHP 7.0 -``centos-7`` PHP 5.4 -``centos-7-php56`` PHP 5.6 -====================== ========================== =============== +====================== =================================== =============== +Tag Distribution name PHP Version +====================== =================================== =============== +``5.6`` *customized official php image* PHP 5.6 +``7.0`` *customized official php image* PHP 7.0 +``7.1`` *customized official php image* PHP 7.1 +``alpine`` *link to alpine-php7* PHP 7.x +``alpine-php7`` PHP 7.x +``alpine-php5`` PHP 5.6 +``alpine-3`` *deprecated* PHP 5.6 +``alpine-3-php7`` *deprecated* PHP 7.x +``ubuntu-12.04`` precise PHP 5.3 +``ubuntu-14.04`` trusty (LTS) PHP 5.5 +``ubuntu-15.04`` vivid PHP 5.6 +``ubuntu-15.10`` wily PHP 5.6 +``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 sury) +``debian-9`` stretch PHP 7.0 +``centos-7`` PHP 5.4 +``centos-7-php56`` PHP 5.6 +====================== =================================== =============== From 3f4edbcdac2dd24680858a58d86fe86f961f7c55 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 01:15:39 +0200 Subject: [PATCH 40/58] Adapt FROM for alpine naming change --- docker/ansible/alpine-php5/Dockerfile | 4 ++-- docker/apache-dev/alpine-php5/Dockerfile | 4 ++-- docker/apache/alpine-php5/Dockerfile | 4 ++-- docker/base-app/alpine-php5/Dockerfile | 4 ++-- docker/base/alpine-php5/Dockerfile | 5 ++--- docker/base/centos-7/Dockerfile | 1 - docker/base/debian-7/Dockerfile | 1 - docker/base/debian-8/Dockerfile | 1 - docker/base/debian-9/Dockerfile | 1 - docker/base/ubuntu-12.04/Dockerfile | 1 - docker/base/ubuntu-14.04/Dockerfile | 1 - docker/base/ubuntu-15.04/Dockerfile | 1 - docker/base/ubuntu-15.10/Dockerfile | 1 - docker/base/ubuntu-16.04/Dockerfile | 1 - docker/base/ubuntu-16.10/Dockerfile | 1 - docker/bootstrap/alpine-php5/Dockerfile | 2 +- docker/certbot/latest/Dockerfile | 2 +- docker/nginx-dev/alpine-php5/Dockerfile | 4 ++-- docker/nginx/alpine-php5/Dockerfile | 4 ++-- docker/php-apache-dev/alpine-php5/Dockerfile | 4 ++-- docker/php-apache-dev/alpine-php7/Dockerfile | 4 ++-- docker/php-apache/alpine-php5/Dockerfile | 4 ++-- docker/php-apache/alpine-php7/Dockerfile | 4 ++-- docker/php-dev/alpine-php5/Dockerfile | 4 ++-- docker/php-dev/alpine-php7/Dockerfile | 4 ++-- docker/php-nginx-dev/alpine-php5/Dockerfile | 4 ++-- docker/php-nginx-dev/alpine-php7/Dockerfile | 4 ++-- docker/php-nginx/alpine-php5/Dockerfile | 4 ++-- docker/php-nginx/alpine-php7/Dockerfile | 4 ++-- docker/php-official/5.6/Dockerfile | 1 - docker/php-official/7.0/Dockerfile | 1 - docker/php-official/7.1/Dockerfile | 1 - docker/php/alpine-php5/Dockerfile | 4 ++-- docker/php/alpine-php7/Dockerfile | 4 ++-- docker/samson-deployment/latest/Dockerfile | 1 - docker/sphinx/latest/Dockerfile | 2 +- docker/varnish/latest/Dockerfile | 2 +- 37 files changed, 42 insertions(+), 57 deletions(-) diff --git a/docker/ansible/alpine-php5/Dockerfile b/docker/ansible/alpine-php5/Dockerfile index 25084dbfe..7cbff4b4e 100644 --- a/docker/ansible/alpine-php5/Dockerfile +++ b/docker/ansible/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:alpine +# Dockerfile for webdevops/ansible:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine-3 +FROM webdevops/bootstrap:alpine # Install ansible RUN /usr/local/bin/apk-install \ diff --git a/docker/apache-dev/alpine-php5/Dockerfile b/docker/apache-dev/alpine-php5/Dockerfile index c1a230fa1..d990e59bb 100644 --- a/docker/apache-dev/alpine-php5/Dockerfile +++ b/docker/apache-dev/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:alpine +# Dockerfile for webdevops/apache-dev:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/apache:alpine-3 +FROM webdevops/apache:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/apache/alpine-php5/Dockerfile b/docker/apache/alpine-php5/Dockerfile index d5e84c1f8..d383579dd 100644 --- a/docker/apache/alpine-php5/Dockerfile +++ b/docker/apache/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:alpine +# Dockerfile for webdevops/apache:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine-3 +FROM webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/base-app/alpine-php5/Dockerfile b/docker/base-app/alpine-php5/Dockerfile index 696b1d933..f02957225 100644 --- a/docker/base-app/alpine-php5/Dockerfile +++ b/docker/base-app/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:alpine +# Dockerfile for webdevops/base-app:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine-3 +FROM webdevops/base:alpine ENV APPLICATION_USER=application \ APPLICATION_GROUP=application \ diff --git a/docker/base/alpine-php5/Dockerfile b/docker/base/alpine-php5/Dockerfile index 0e470fa84..9f89f58d9 100644 --- a/docker/base/alpine-php5/Dockerfile +++ b/docker/base/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:alpine +# Dockerfile for webdevops/base:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine-3 +FROM webdevops/bootstrap:alpine ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ @@ -36,7 +36,6 @@ RUN /usr/local/bin/apk-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ - python \ supervisor \ syslog-ng \ wget \ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 9245359c3..45c23338a 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -36,7 +36,6 @@ RUN /usr/local/bin/yum-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ - python \ supervisor \ syslog-ng \ wget \ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 8b426c7e5..89ff6e935 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -38,7 +38,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 34614ec16..0667935fb 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -38,7 +38,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 862e4f2bd..4b6fa28f3 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -38,7 +38,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 36f93e96c..680bc24e0 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index a6e38ac1e..6c203b3e6 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index ee32e2cae..acc84ff30 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 6ac82010d..42ec69c25 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 0c966ebb0..51d964416 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index be96a1e1d..9721ee067 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -37,7 +37,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/bootstrap/alpine-php5/Dockerfile b/docker/bootstrap/alpine-php5/Dockerfile index 259275af2..67ffe6a03 100644 --- a/docker/bootstrap/alpine-php5/Dockerfile +++ b/docker/bootstrap/alpine-php5/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:alpine +# Dockerfile for webdevops/bootstrap:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 21137e461..812673a5a 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine-3 +FROM webdevops/bootstrap:alpine VOLUME /etc/letsencrypt VOLUME /var/www diff --git a/docker/nginx-dev/alpine-php5/Dockerfile b/docker/nginx-dev/alpine-php5/Dockerfile index 70c3d02f0..9aeb501a9 100644 --- a/docker/nginx-dev/alpine-php5/Dockerfile +++ b/docker/nginx-dev/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:alpine +# Dockerfile for webdevops/nginx-dev:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/nginx:alpine-3 +FROM webdevops/nginx:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/nginx/alpine-php5/Dockerfile b/docker/nginx/alpine-php5/Dockerfile index 7d54cf4f5..58e747ae4 100644 --- a/docker/nginx/alpine-php5/Dockerfile +++ b/docker/nginx/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:alpine +# Dockerfile for webdevops/nginx:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine-3 +FROM webdevops/base:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile b/docker/php-apache-dev/alpine-php5/Dockerfile index a7d8b5e02..c8c60ba9d 100644 --- a/docker/php-apache-dev/alpine-php5/Dockerfile +++ b/docker/php-apache-dev/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:alpine +# Dockerfile for webdevops/php-apache-dev:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine-3 +FROM webdevops/php-dev:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/alpine-php7/Dockerfile b/docker/php-apache-dev/alpine-php7/Dockerfile index 5eb88cce8..cdbcb36f4 100644 --- a/docker/php-apache-dev/alpine-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache-dev:alpine-3-php7 +# Dockerfile for webdevops/php-apache-dev:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine-3-php7 +FROM webdevops/php-dev:alpine-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/alpine-php5/Dockerfile b/docker/php-apache/alpine-php5/Dockerfile index 1b18c741e..ea79aefdd 100644 --- a/docker/php-apache/alpine-php5/Dockerfile +++ b/docker/php-apache/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:alpine +# Dockerfile for webdevops/php-apache:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3 +FROM webdevops/php:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/alpine-php7/Dockerfile b/docker/php-apache/alpine-php7/Dockerfile index 349474e38..c2f4c9f5a 100644 --- a/docker/php-apache/alpine-php7/Dockerfile +++ b/docker/php-apache/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-apache:alpine-3-php7 +# Dockerfile for webdevops/php-apache:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3-php7 +FROM webdevops/php:alpine-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-dev/alpine-php5/Dockerfile b/docker/php-dev/alpine-php5/Dockerfile index 0a7513f1f..c454438d0 100644 --- a/docker/php-dev/alpine-php5/Dockerfile +++ b/docker/php-dev/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:alpine +# Dockerfile for webdevops/php-dev:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3 +FROM webdevops/php:alpine COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-php7/Dockerfile b/docker/php-dev/alpine-php7/Dockerfile index 0039ea87c..27cf3e7a3 100644 --- a/docker/php-dev/alpine-php7/Dockerfile +++ b/docker/php-dev/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-dev:alpine-3-php7 +# Dockerfile for webdevops/php-dev:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3-php7 +FROM webdevops/php:alpine-php7 COPY conf/ /opt/docker/ diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile b/docker/php-nginx-dev/alpine-php5/Dockerfile index a7253fe6c..3b317b3ed 100644 --- a/docker/php-nginx-dev/alpine-php5/Dockerfile +++ b/docker/php-nginx-dev/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:alpine +# Dockerfile for webdevops/php-nginx-dev:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine-3 +FROM webdevops/php-dev:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/alpine-php7/Dockerfile b/docker/php-nginx-dev/alpine-php7/Dockerfile index 278999476..88393d256 100644 --- a/docker/php-nginx-dev/alpine-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx-dev:alpine-3-php7 +# Dockerfile for webdevops/php-nginx-dev:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine-3-php7 +FROM webdevops/php-dev:alpine-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/alpine-php5/Dockerfile b/docker/php-nginx/alpine-php5/Dockerfile index 1ec038e33..7ae8ecf2b 100644 --- a/docker/php-nginx/alpine-php5/Dockerfile +++ b/docker/php-nginx/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:alpine +# Dockerfile for webdevops/php-nginx:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3 +FROM webdevops/php:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/alpine-php7/Dockerfile b/docker/php-nginx/alpine-php7/Dockerfile index 480dc3680..a4096ee32 100644 --- a/docker/php-nginx/alpine-php7/Dockerfile +++ b/docker/php-nginx/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-nginx:alpine-3-php7 +# Dockerfile for webdevops/php-nginx:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine-3-php7 +FROM webdevops/php:alpine-php7 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 0be41a66a..c390c8946 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -91,7 +91,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 8d7da39a9..91bf263bf 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -91,7 +91,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 4347e292a..05bc4f085 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -91,7 +91,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/php/alpine-php5/Dockerfile b/docker/php/alpine-php5/Dockerfile index d22302204..27d9c1216 100644 --- a/docker/php/alpine-php5/Dockerfile +++ b/docker/php/alpine-php5/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:alpine +# Dockerfile for webdevops/php:alpine-php5 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:alpine-3 +FROM webdevops/base-app:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php/alpine-php7/Dockerfile b/docker/php/alpine-php7/Dockerfile index 7b9c32eaa..7a080db9b 100644 --- a/docker/php/alpine-php7/Dockerfile +++ b/docker/php/alpine-php7/Dockerfile @@ -1,9 +1,9 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:alpine-3-php7 +# Dockerfile for webdevops/php:alpine-php7 # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:alpine-3 +FROM webdevops/base-app:alpine ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index b1bdc6d5d..db272be2e 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -91,7 +91,6 @@ RUN /usr/local/bin/apt-install \ # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ - python-minimal \ supervisor \ syslog-ng \ syslog-ng-core \ diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index f3da4e287..901b4b776 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/bootstrap:alpine-3 +FROM webdevops/bootstrap:alpine RUN /usr/local/bin/apk-install \ # General python diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index ad852081c..7ff2c1f9f 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base:alpine-3 +FROM webdevops/base:alpine ENV VARNISH_PORT 80 From fdbcaec02332a762bb539e26133bb9d829aa0c8d Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 01:15:56 +0200 Subject: [PATCH 41/58] Update go-replace to 0.5.4 --- docker/bootstrap/alpine-php5/Dockerfile | 2 +- docker/bootstrap/centos-7/Dockerfile | 2 +- docker/bootstrap/debian-7/Dockerfile | 2 +- docker/bootstrap/debian-8/Dockerfile | 2 +- docker/bootstrap/debian-9/Dockerfile | 2 +- docker/bootstrap/ubuntu-12.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-14.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-15.10/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.04/Dockerfile | 2 +- docker/bootstrap/ubuntu-16.10/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 2 +- docker/php-official/7.0/Dockerfile | 2 +- docker/php-official/7.1/Dockerfile | 2 +- docker/samson-deployment/latest/Dockerfile | 2 +- template/Dockerfile/tools.jinja2 | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/bootstrap/alpine-php5/Dockerfile b/docker/bootstrap/alpine-php5/Dockerfile index 67ffe6a03..1470c6be9 100644 --- a/docker/bootstrap/alpine-php5/Dockerfile +++ b/docker/bootstrap/alpine-php5/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && gosu nobody true \ && apk del .gosu-deps \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && /usr/local/bin/docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index b99e79319..e879160da 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -38,7 +38,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 1f4d02777..8890ead14 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index bb4c76f1c..f769aa8b1 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 9c195b3f3..81492d33d 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 35ae85c3b..b0f296459 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -50,7 +50,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 6ad699b9d..3634806fa 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index c032414be..27bdd36ef 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 06787f898..bad1f136f 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 775d612f8..803a33461 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 1d884c73d..51cb2d5f5 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -45,7 +45,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index c390c8946..3d7f12682 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -58,7 +58,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 91bf263bf..6e3e1f571 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -58,7 +58,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 05bc4f085..100ae5c04 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -58,7 +58,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index db272be2e..9ac25b5f7 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true \ ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index 54f414659..6e2b94444 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,6 +1,6 @@ {% macro goreplace() -%} ## Install go-replace - && GOREPLACE_VERSION=0.5.3 \ + && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ {%- endmacro %} From e0143208d80a77759b40a361a0827376f4fcf19f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 01:17:02 +0200 Subject: [PATCH 42/58] Fix os detection for tests --- conf/console.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/console.yml b/conf/console.yml index 275cc4288..bfb843423 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -37,7 +37,7 @@ dockerTest: - 'ENV VARNISH_BACKEND_HOST webdevops.io' configuration: - imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-(?P[^-]+)?' + imageConfigurationRegex: ':(?Palpine|debian|ubuntu|centos)-?(?P[^-]+)?' default: OS_FAMILY: 'ubuntu' OS_VERSION: '16.04' @@ -45,6 +45,7 @@ dockerTest: ':centos': OS_FAMILY: 'redhat' ':alpine': + OS_FAMILY: 'alpine' OS_VERSION: '3' PHP_REDIS: '0' ':ubuntu-12.04': From 01b0b4e2d3e757c776a63f6cf365c0c4104294a2 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 01:31:45 +0200 Subject: [PATCH 43/58] Fix wrong renaming of alpine (not php) images --- docker/ansible/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../apache-dev/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/httpd.d/12-development.sh | 0 .../conf/etc/httpd/conf.d/02-dev.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 0 .../roles/webdevops-apache-dev/defaults/main.yml | 0 .../roles/webdevops-apache-dev/tasks/bootstrap.yml | 0 .../roles/webdevops-apache-dev/tasks/main.yml | 0 docker/apache/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2-e | 0 .../conf/bin/service.d/httpd.d/10-init.sh | 0 .../conf/bin/service.d/httpd.sh | 0 .../conf/etc/httpd/conf.d/.gitkeep | 0 .../conf/etc/httpd/conf.d/10-error-document.conf | 0 .../conf/etc/httpd/conf.d/10-log.conf | 0 .../conf/etc/httpd/conf.d/10-php.conf | 0 .../conf/etc/httpd/conf.d/10-server.conf | 0 .../conf/etc/httpd/global.conf | 0 .../conf/etc/httpd/main.conf | 0 .../{alpine-php5 => alpine}/conf/etc/httpd/php.conf | 0 .../conf/etc/httpd/ssl/server.crt | 0 .../conf/etc/httpd/ssl/server.csr | 0 .../conf/etc/httpd/ssl/server.key | 0 .../conf/etc/httpd/vhost.common.conf | 0 .../conf/etc/httpd/vhost.common.d/.gitkeep | 0 .../etc/httpd/vhost.common.d/01-boilerplate.conf | 0 .../conf/etc/httpd/vhost.conf | 0 .../conf/etc/httpd/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/apache.conf | 0 .../roles/webdevops-apache/defaults/main.yml | 0 .../roles/webdevops-apache/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-apache/tasks/main.yml | 0 docker/base-app/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../roles/webdevops-base-app/defaults/main.yml | 0 .../roles/webdevops-base-app/tasks/bootstrap.yml | 0 .../tasks/bootstrap/application.yml | 0 .../webdevops-base-app/tasks/bootstrap/user.yml | 0 .../roles/webdevops-base-app/tasks/main.yml | 0 docker/base/{alpine-php5 => alpine}/Dockerfile | 0 .../base/{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 docker/base/{alpine-php5 => alpine}/conf/VERSION | 0 .../{alpine-php5 => alpine}/conf/bin/bootstrap.sh | 0 .../base/{alpine-php5 => alpine}/conf/bin/config.sh | 0 .../{alpine-php5 => alpine}/conf/bin/control.sh | 0 .../conf/bin/entrypoint.d/cli.sh | 0 .../conf/bin/entrypoint.d/default.sh | 0 .../conf/bin/entrypoint.d/noop.sh | 0 .../conf/bin/entrypoint.d/root.sh | 0 .../conf/bin/entrypoint.d/supervisord.sh | 0 .../{alpine-php5 => alpine}/conf/bin/entrypoint.sh | 0 .../{alpine-php5 => alpine}/conf/bin/logwatch.sh | 0 .../base/{alpine-php5 => alpine}/conf/bin/provision | 0 .../{alpine-php5 => alpine}/conf/bin/provision.sh | 0 .../conf/bin/service.d/cron.d/10-init.sh | 0 .../conf/bin/service.d/cron.sh | 0 .../conf/bin/service.d/dnsmasq.d/10-init.sh | 0 .../conf/bin/service.d/dnsmasq.sh | 0 .../conf/bin/service.d/postfix.d/10-init.sh | 0 .../conf/bin/service.d/postfix.sh | 0 .../conf/bin/service.d/ssh.d/10-init.sh | 0 .../conf/bin/service.d/ssh.sh | 0 .../conf/bin/service.d/supervisor.d/10-init.sh | 0 .../conf/bin/service.d/supervisor.sh | 0 .../conf/bin/service.d/syslog-ng.d/10-init.sh | 0 .../conf/bin/service.d/syslog-ng.sh | 0 .../conf/bin/usr-bin/docker-service-disable | 0 .../conf/bin/usr-bin/docker-service-enable | 0 .../conf/bin/usr-bin/service | 0 .../conf/etc/logrotate.d/syslog-ng | 0 .../conf/etc/supervisor.conf | 0 .../conf/etc/supervisor.d/.gitkeep | 0 .../conf/etc/supervisor.d/cron.conf | 0 .../conf/etc/supervisor.d/dnsmasq.conf | 0 .../conf/etc/supervisor.d/postfix.conf | 0 .../conf/etc/supervisor.d/ssh.conf | 0 .../conf/etc/supervisor.d/syslog-ng.conf | 0 .../conf/etc/syslog-ng/syslog-ng.conf | 0 .../conf/provision/ansible.cfg | 0 .../conf/provision/bootstrap.d/.gitkeep | 0 .../conf/provision/build.d/.gitkeep | 0 .../conf/provision/build.d/10-cleanup.sh | 0 .../conf/provision/entrypoint.d/.gitkeep | 0 .../conf/provision/entrypoint.d/05-permissions.sh | 0 .../conf/provision/onbuild.d/.gitkeep | 0 .../roles/webdevops-base/defaults/main.yml | 0 .../roles/webdevops-base/tasks/bootstrap.yml | 0 .../roles/webdevops-base/tasks/bootstrap/misc.yml | 0 .../roles/webdevops-base/tasks/bootstrap/pam.yml | 0 .../roles/webdevops-base/tasks/bootstrap/root.yml | 0 .../webdevops-base/tasks/bootstrap/supervisor.yml | 0 .../webdevops-base/tasks/bootstrap/syslog-ng.yml | 0 .../roles/webdevops-base/tasks/bootstrap/system.yml | 0 .../provision/roles/webdevops-base/tasks/build.yml | 0 .../roles/webdevops-base/tasks/build/.gitkeep | 0 .../roles/webdevops-base/tasks/entrypoint.yml | 0 .../roles/webdevops-base/tasks/entrypoint/.gitkeep | 0 .../provision/roles/webdevops-base/tasks/main.yml | 0 .../roles/webdevops-cleanup/tasks/cleanup.yml | 0 .../roles/webdevops-cleanup/tasks/main.yml | 0 .../conf/provision/service.d/.gitkeep | 0 .../conf/provision/service.d/cron.sh | 0 .../conf/provision/service.d/dnsmasq.sh | 0 .../conf/provision/service.d/postfix.sh | 0 .../conf/provision/service.d/ssh.sh | 0 .../conf/provision/variables-webdevops.yml | 0 .../conf/provision/variables.yml | 0 docker/bootstrap/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../{alpine-php5 => alpine}/baselayout.tar | Bin docker/nginx-dev/{alpine-php5 => alpine}/Dockerfile | 0 .../{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/12-development.sh | 0 .../conf/etc/nginx/conf.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/02-dev.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../roles/webdevops-nginx-dev/defaults/main.yml | 0 .../roles/webdevops-nginx-dev/tasks/bootstrap.yml | 0 .../webdevops-nginx-dev/tasks/bootstrap/nginx.yml | 0 .../roles/webdevops-nginx-dev/tasks/main.yml | 0 docker/nginx/{alpine-php5 => alpine}/Dockerfile | 0 .../nginx/{alpine-php5 => alpine}/Dockerfile.jinja2 | 0 .../conf/bin/service.d/nginx.d/10-init.sh | 0 .../conf/bin/service.d/nginx.sh | 0 .../conf/etc/nginx/conf.d/.gitkeep | 0 .../conf/etc/nginx/conf.d/10-php.conf | 0 .../conf/etc/nginx/global.conf | 0 .../conf/etc/nginx/main.conf | 0 .../conf/etc/nginx/nginx.conf | 0 .../{alpine-php5 => alpine}/conf/etc/nginx/php.conf | 0 .../conf/etc/nginx/ssl/server.crt | 0 .../conf/etc/nginx/ssl/server.csr | 0 .../conf/etc/nginx/ssl/server.key | 0 .../conf/etc/nginx/vhost.common.conf | 0 .../conf/etc/nginx/vhost.common.d/.gitkeep | 0 .../conf/etc/nginx/vhost.common.d/10-general.conf | 0 .../etc/nginx/vhost.common.d/10-location-root.conf | 0 .../conf/etc/nginx/vhost.common.d/10-log.conf | 0 .../conf/etc/nginx/vhost.common.d/10-php.conf | 0 .../conf/etc/nginx/vhost.conf | 0 .../conf/etc/nginx/vhost.ssl.conf | 0 .../conf/etc/supervisor.d/nginx.conf | 0 .../roles/webdevops-nginx/defaults/main.yml | 0 .../roles/webdevops-nginx/tasks/bootstrap.yml | 0 .../provision/roles/webdevops-nginx/tasks/main.yml | 0 151 files changed, 0 insertions(+), 0 deletions(-) rename docker/ansible/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/ansible/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/apache-dev/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/apache-dev/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/bin/service.d/httpd.d/12-development.sh (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/02-dev.conf (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache-dev/defaults/main.yml (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml (100%) rename docker/apache-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache-dev/tasks/main.yml (100%) rename docker/apache/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/apache/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/apache/{alpine-php5 => alpine}/Dockerfile.jinja2-e (100%) rename docker/apache/{alpine-php5 => alpine}/conf/bin/service.d/httpd.d/10-init.sh (100%) rename docker/apache/{alpine-php5 => alpine}/conf/bin/service.d/httpd.sh (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/.gitkeep (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/10-error-document.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/10-log.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/10-php.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/conf.d/10-server.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/global.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/main.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/php.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/ssl/server.crt (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/ssl/server.csr (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/ssl/server.key (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/vhost.common.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/vhost.common.d/.gitkeep (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/vhost.common.d/01-boilerplate.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/vhost.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/httpd/vhost.ssl.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/etc/supervisor.d/apache.conf (100%) rename docker/apache/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache/defaults/main.yml (100%) rename docker/apache/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml (100%) rename docker/apache/{alpine-php5 => alpine}/conf/provision/roles/webdevops-apache/tasks/main.yml (100%) rename docker/base-app/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/base-app/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base-app/defaults/main.yml (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml (100%) rename docker/base-app/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base-app/tasks/main.yml (100%) rename docker/base/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/base/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/base/{alpine-php5 => alpine}/conf/VERSION (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/bootstrap.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/config.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/control.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.d/cli.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.d/default.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.d/noop.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.d/root.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.d/supervisord.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/entrypoint.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/logwatch.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/provision (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/provision.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/cron.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/cron.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/dnsmasq.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/dnsmasq.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/postfix.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/postfix.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/ssh.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/ssh.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/supervisor.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/supervisor.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/syslog-ng.d/10-init.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/service.d/syslog-ng.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/usr-bin/docker-service-disable (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/usr-bin/docker-service-enable (100%) rename docker/base/{alpine-php5 => alpine}/conf/bin/usr-bin/service (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/logrotate.d/syslog-ng (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/cron.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/dnsmasq.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/postfix.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/ssh.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/supervisor.d/syslog-ng.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/etc/syslog-ng/syslog-ng.conf (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/ansible.cfg (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/bootstrap.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/build.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/build.d/10-cleanup.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/entrypoint.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/entrypoint.d/05-permissions.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/onbuild.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/defaults/main.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/build.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/build/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/entrypoint.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-base/tasks/main.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/roles/webdevops-cleanup/tasks/main.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/service.d/.gitkeep (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/service.d/cron.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/service.d/dnsmasq.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/service.d/postfix.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/service.d/ssh.sh (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/variables-webdevops.yml (100%) rename docker/base/{alpine-php5 => alpine}/conf/provision/variables.yml (100%) rename docker/bootstrap/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/bootstrap/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/bootstrap/{alpine-php5 => alpine}/baselayout.tar (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/bin/service.d/nginx.d/12-development.sh (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/etc/nginx/conf.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml (100%) rename docker/nginx-dev/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml (100%) rename docker/nginx/{alpine-php5 => alpine}/Dockerfile (100%) rename docker/nginx/{alpine-php5 => alpine}/Dockerfile.jinja2 (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/bin/service.d/nginx.d/10-init.sh (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/bin/service.d/nginx.sh (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/conf.d/.gitkeep (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/conf.d/10-php.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/global.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/main.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/nginx.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/php.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/ssl/server.crt (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/ssl/server.csr (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/ssl/server.key (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/.gitkeep (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/10-general.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/10-location-root.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/10-log.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.common.d/10-php.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/nginx/vhost.ssl.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/etc/supervisor.d/nginx.conf (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx/defaults/main.yml (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml (100%) rename docker/nginx/{alpine-php5 => alpine}/conf/provision/roles/webdevops-nginx/tasks/main.yml (100%) diff --git a/docker/ansible/alpine-php5/Dockerfile b/docker/ansible/alpine/Dockerfile similarity index 100% rename from docker/ansible/alpine-php5/Dockerfile rename to docker/ansible/alpine/Dockerfile diff --git a/docker/ansible/alpine-php5/Dockerfile.jinja2 b/docker/ansible/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/ansible/alpine-php5/Dockerfile.jinja2 rename to docker/ansible/alpine/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine-php5/Dockerfile b/docker/apache-dev/alpine/Dockerfile similarity index 100% rename from docker/apache-dev/alpine-php5/Dockerfile rename to docker/apache-dev/alpine/Dockerfile diff --git a/docker/apache-dev/alpine-php5/Dockerfile.jinja2 b/docker/apache-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/apache-dev/alpine-php5/Dockerfile.jinja2 rename to docker/apache-dev/alpine/Dockerfile.jinja2 diff --git a/docker/apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh similarity index 100% rename from docker/apache-dev/alpine-php5/conf/bin/service.d/httpd.d/12-development.sh rename to docker/apache-dev/alpine/conf/bin/service.d/httpd.d/12-development.sh diff --git a/docker/apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine-php5/conf/etc/httpd/conf.d/02-dev.conf rename to docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf similarity index 100% rename from docker/apache-dev/alpine-php5/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml similarity index 100% rename from docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/defaults/main.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/defaults/main.yml diff --git a/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml similarity index 100% rename from docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml diff --git a/docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml b/docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml similarity index 100% rename from docker/apache-dev/alpine-php5/conf/provision/roles/webdevops-apache-dev/tasks/main.yml rename to docker/apache-dev/alpine/conf/provision/roles/webdevops-apache-dev/tasks/main.yml diff --git a/docker/apache/alpine-php5/Dockerfile b/docker/apache/alpine/Dockerfile similarity index 100% rename from docker/apache/alpine-php5/Dockerfile rename to docker/apache/alpine/Dockerfile diff --git a/docker/apache/alpine-php5/Dockerfile.jinja2 b/docker/apache/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/apache/alpine-php5/Dockerfile.jinja2 rename to docker/apache/alpine/Dockerfile.jinja2 diff --git a/docker/apache/alpine-php5/Dockerfile.jinja2-e b/docker/apache/alpine/Dockerfile.jinja2-e similarity index 100% rename from docker/apache/alpine-php5/Dockerfile.jinja2-e rename to docker/apache/alpine/Dockerfile.jinja2-e diff --git a/docker/apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh b/docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/alpine-php5/conf/bin/service.d/httpd.d/10-init.sh rename to docker/apache/alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/alpine-php5/conf/bin/service.d/httpd.sh b/docker/apache/alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/alpine-php5/conf/bin/service.d/httpd.sh rename to docker/apache/alpine/conf/bin/service.d/httpd.sh diff --git a/docker/apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep b/docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/conf.d/.gitkeep rename to docker/apache/alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-log.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-php.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf b/docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/conf.d/10-server.conf rename to docker/apache/alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/global.conf b/docker/apache/alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/global.conf rename to docker/apache/alpine/conf/etc/httpd/global.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/main.conf b/docker/apache/alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/main.conf rename to docker/apache/alpine/conf/etc/httpd/main.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/php.conf b/docker/apache/alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/php.conf rename to docker/apache/alpine/conf/etc/httpd/php.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.crt b/docker/apache/alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/ssl/server.crt rename to docker/apache/alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.csr b/docker/apache/alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/ssl/server.csr rename to docker/apache/alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/alpine-php5/conf/etc/httpd/ssl/server.key b/docker/apache/alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/ssl/server.key rename to docker/apache/alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.conf b/docker/apache/alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/vhost.common.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/apache/alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/vhost.conf b/docker/apache/alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/vhost.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.conf diff --git a/docker/apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf b/docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/httpd/vhost.ssl.conf rename to docker/apache/alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/alpine-php5/conf/etc/supervisor.d/apache.conf b/docker/apache/alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/alpine-php5/conf/etc/supervisor.d/apache.conf rename to docker/apache/alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml similarity index 100% rename from docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/defaults/main.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/defaults/main.yml diff --git a/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml similarity index 100% rename from docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml diff --git a/docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml similarity index 100% rename from docker/apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/main.yml rename to docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/main.yml diff --git a/docker/base-app/alpine-php5/Dockerfile b/docker/base-app/alpine/Dockerfile similarity index 100% rename from docker/base-app/alpine-php5/Dockerfile rename to docker/base-app/alpine/Dockerfile diff --git a/docker/base-app/alpine-php5/Dockerfile.jinja2 b/docker/base-app/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/base-app/alpine-php5/Dockerfile.jinja2 rename to docker/base-app/alpine/Dockerfile.jinja2 diff --git a/docker/base-app/alpine-php5/conf/provision/onbuild.d/.gitkeep b/docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/onbuild.d/.gitkeep rename to docker/base-app/alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/defaults/main.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/defaults/main.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/defaults/main.yml diff --git a/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml diff --git a/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/application.yml diff --git a/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/bootstrap/user.yml diff --git a/docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/main.yml b/docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml similarity index 100% rename from docker/base-app/alpine-php5/conf/provision/roles/webdevops-base-app/tasks/main.yml rename to docker/base-app/alpine/conf/provision/roles/webdevops-base-app/tasks/main.yml diff --git a/docker/base/alpine-php5/Dockerfile b/docker/base/alpine/Dockerfile similarity index 100% rename from docker/base/alpine-php5/Dockerfile rename to docker/base/alpine/Dockerfile diff --git a/docker/base/alpine-php5/Dockerfile.jinja2 b/docker/base/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/base/alpine-php5/Dockerfile.jinja2 rename to docker/base/alpine/Dockerfile.jinja2 diff --git a/docker/base/alpine-php5/conf/VERSION b/docker/base/alpine/conf/VERSION similarity index 100% rename from docker/base/alpine-php5/conf/VERSION rename to docker/base/alpine/conf/VERSION diff --git a/docker/base/alpine-php5/conf/bin/bootstrap.sh b/docker/base/alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/bootstrap.sh rename to docker/base/alpine/conf/bin/bootstrap.sh diff --git a/docker/base/alpine-php5/conf/bin/config.sh b/docker/base/alpine/conf/bin/config.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/config.sh rename to docker/base/alpine/conf/bin/config.sh diff --git a/docker/base/alpine-php5/conf/bin/control.sh b/docker/base/alpine/conf/bin/control.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/control.sh rename to docker/base/alpine/conf/bin/control.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.d/cli.sh b/docker/base/alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.d/cli.sh rename to docker/base/alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.d/default.sh b/docker/base/alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.d/default.sh rename to docker/base/alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.d/noop.sh b/docker/base/alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.d/noop.sh rename to docker/base/alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.d/root.sh b/docker/base/alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.d/root.sh rename to docker/base/alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.d/supervisord.sh b/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.d/supervisord.sh rename to docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/alpine-php5/conf/bin/entrypoint.sh b/docker/base/alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/entrypoint.sh rename to docker/base/alpine/conf/bin/entrypoint.sh diff --git a/docker/base/alpine-php5/conf/bin/logwatch.sh b/docker/base/alpine/conf/bin/logwatch.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/logwatch.sh rename to docker/base/alpine/conf/bin/logwatch.sh diff --git a/docker/base/alpine-php5/conf/bin/provision b/docker/base/alpine/conf/bin/provision similarity index 100% rename from docker/base/alpine-php5/conf/bin/provision rename to docker/base/alpine/conf/bin/provision diff --git a/docker/base/alpine-php5/conf/bin/provision.sh b/docker/base/alpine/conf/bin/provision.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/provision.sh rename to docker/base/alpine/conf/bin/provision.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/cron.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/cron.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/cron.sh b/docker/base/alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/cron.sh rename to docker/base/alpine/conf/bin/service.d/cron.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/dnsmasq.sh b/docker/base/alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/dnsmasq.sh rename to docker/base/alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/postfix.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/postfix.sh b/docker/base/alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/postfix.sh rename to docker/base/alpine/conf/bin/service.d/postfix.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/ssh.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/ssh.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/ssh.sh b/docker/base/alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/ssh.sh rename to docker/base/alpine/conf/bin/service.d/ssh.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/supervisor.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/supervisor.sh b/docker/base/alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/supervisor.sh rename to docker/base/alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/syslog-ng.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/base/alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/alpine-php5/conf/bin/service.d/syslog-ng.sh b/docker/base/alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/alpine-php5/conf/bin/service.d/syslog-ng.sh rename to docker/base/alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/alpine-php5/conf/bin/usr-bin/docker-service-disable b/docker/base/alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/alpine-php5/conf/bin/usr-bin/docker-service-disable rename to docker/base/alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/alpine-php5/conf/bin/usr-bin/docker-service-enable b/docker/base/alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/alpine-php5/conf/bin/usr-bin/docker-service-enable rename to docker/base/alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/alpine-php5/conf/bin/usr-bin/service b/docker/base/alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/base/alpine-php5/conf/bin/usr-bin/service rename to docker/base/alpine/conf/bin/usr-bin/service diff --git a/docker/base/alpine-php5/conf/etc/logrotate.d/syslog-ng b/docker/base/alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/alpine-php5/conf/etc/logrotate.d/syslog-ng rename to docker/base/alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/alpine-php5/conf/etc/supervisor.conf b/docker/base/alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.conf rename to docker/base/alpine/conf/etc/supervisor.conf diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/.gitkeep b/docker/base/alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/.gitkeep rename to docker/base/alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/cron.conf b/docker/base/alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/cron.conf rename to docker/base/alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/dnsmasq.conf b/docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/dnsmasq.conf rename to docker/base/alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/postfix.conf b/docker/base/alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/postfix.conf rename to docker/base/alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/ssh.conf b/docker/base/alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/ssh.conf rename to docker/base/alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/alpine-php5/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf diff --git a/docker/base/alpine-php5/conf/etc/syslog-ng/syslog-ng.conf b/docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/alpine-php5/conf/etc/syslog-ng/syslog-ng.conf rename to docker/base/alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/alpine-php5/conf/provision/ansible.cfg b/docker/base/alpine/conf/provision/ansible.cfg similarity index 100% rename from docker/base/alpine-php5/conf/provision/ansible.cfg rename to docker/base/alpine/conf/provision/ansible.cfg diff --git a/docker/base/alpine-php5/conf/provision/bootstrap.d/.gitkeep b/docker/base/alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/bootstrap.d/.gitkeep rename to docker/base/alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/build.d/.gitkeep b/docker/base/alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/build.d/.gitkeep rename to docker/base/alpine/conf/provision/build.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/build.d/10-cleanup.sh b/docker/base/alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/build.d/10-cleanup.sh rename to docker/base/alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/alpine-php5/conf/provision/entrypoint.d/.gitkeep b/docker/base/alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/entrypoint.d/.gitkeep rename to docker/base/alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/entrypoint.d/05-permissions.sh b/docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/entrypoint.d/05-permissions.sh rename to docker/base/alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/base/alpine-php5/conf/provision/onbuild.d/.gitkeep b/docker/base/alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/onbuild.d/.gitkeep rename to docker/base/alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/defaults/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/defaults/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/defaults/main.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/misc.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/pam.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/root.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build/.gitkeep b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/build/.gitkeep rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/build/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/entrypoint/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-base/tasks/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-base/tasks/main.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml b/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml rename to docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/cleanup.yml diff --git a/docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/main.yml b/docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/roles/webdevops-cleanup/tasks/main.yml rename to docker/base/alpine/conf/provision/roles/webdevops-cleanup/tasks/main.yml diff --git a/docker/base/alpine-php5/conf/provision/service.d/.gitkeep b/docker/base/alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/alpine-php5/conf/provision/service.d/.gitkeep rename to docker/base/alpine/conf/provision/service.d/.gitkeep diff --git a/docker/base/alpine-php5/conf/provision/service.d/cron.sh b/docker/base/alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/service.d/cron.sh rename to docker/base/alpine/conf/provision/service.d/cron.sh diff --git a/docker/base/alpine-php5/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/service.d/dnsmasq.sh rename to docker/base/alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/alpine-php5/conf/provision/service.d/postfix.sh b/docker/base/alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/service.d/postfix.sh rename to docker/base/alpine/conf/provision/service.d/postfix.sh diff --git a/docker/base/alpine-php5/conf/provision/service.d/ssh.sh b/docker/base/alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/alpine-php5/conf/provision/service.d/ssh.sh rename to docker/base/alpine/conf/provision/service.d/ssh.sh diff --git a/docker/base/alpine-php5/conf/provision/variables-webdevops.yml b/docker/base/alpine/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/variables-webdevops.yml rename to docker/base/alpine/conf/provision/variables-webdevops.yml diff --git a/docker/base/alpine-php5/conf/provision/variables.yml b/docker/base/alpine/conf/provision/variables.yml similarity index 100% rename from docker/base/alpine-php5/conf/provision/variables.yml rename to docker/base/alpine/conf/provision/variables.yml diff --git a/docker/bootstrap/alpine-php5/Dockerfile b/docker/bootstrap/alpine/Dockerfile similarity index 100% rename from docker/bootstrap/alpine-php5/Dockerfile rename to docker/bootstrap/alpine/Dockerfile diff --git a/docker/bootstrap/alpine-php5/Dockerfile.jinja2 b/docker/bootstrap/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/bootstrap/alpine-php5/Dockerfile.jinja2 rename to docker/bootstrap/alpine/Dockerfile.jinja2 diff --git a/docker/bootstrap/alpine-php5/baselayout.tar b/docker/bootstrap/alpine/baselayout.tar similarity index 100% rename from docker/bootstrap/alpine-php5/baselayout.tar rename to docker/bootstrap/alpine/baselayout.tar diff --git a/docker/nginx-dev/alpine-php5/Dockerfile b/docker/nginx-dev/alpine/Dockerfile similarity index 100% rename from docker/nginx-dev/alpine-php5/Dockerfile rename to docker/nginx-dev/alpine/Dockerfile diff --git a/docker/nginx-dev/alpine-php5/Dockerfile.jinja2 b/docker/nginx-dev/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/nginx-dev/alpine-php5/Dockerfile.jinja2 rename to docker/nginx-dev/alpine/Dockerfile.jinja2 diff --git a/docker/nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/bin/service.d/nginx.d/12-development.sh rename to docker/nginx-dev/alpine/conf/bin/service.d/nginx.d/12-development.sh diff --git a/docker/nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/etc/nginx/conf.d/02-dev.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml diff --git a/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml diff --git a/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml diff --git a/docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml b/docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml similarity index 100% rename from docker/nginx-dev/alpine-php5/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml rename to docker/nginx-dev/alpine/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml diff --git a/docker/nginx/alpine-php5/Dockerfile b/docker/nginx/alpine/Dockerfile similarity index 100% rename from docker/nginx/alpine-php5/Dockerfile rename to docker/nginx/alpine/Dockerfile diff --git a/docker/nginx/alpine-php5/Dockerfile.jinja2 b/docker/nginx/alpine/Dockerfile.jinja2 similarity index 100% rename from docker/nginx/alpine-php5/Dockerfile.jinja2 rename to docker/nginx/alpine/Dockerfile.jinja2 diff --git a/docker/nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh b/docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/alpine-php5/conf/bin/service.d/nginx.d/10-init.sh rename to docker/nginx/alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/alpine-php5/conf/bin/service.d/nginx.sh b/docker/nginx/alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/alpine-php5/conf/bin/service.d/nginx.sh rename to docker/nginx/alpine/conf/bin/service.d/nginx.sh diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep b/docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/conf.d/.gitkeep rename to docker/nginx/alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf b/docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/conf.d/10-php.conf rename to docker/nginx/alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/global.conf b/docker/nginx/alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/global.conf rename to docker/nginx/alpine/conf/etc/nginx/global.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/main.conf b/docker/nginx/alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/main.conf rename to docker/nginx/alpine/conf/etc/nginx/main.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/nginx.conf b/docker/nginx/alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/nginx.conf rename to docker/nginx/alpine/conf/etc/nginx/nginx.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/php.conf b/docker/nginx/alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/php.conf rename to docker/nginx/alpine/conf/etc/nginx/php.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.crt b/docker/nginx/alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.crt rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.csr b/docker/nginx/alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.csr rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.key b/docker/nginx/alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/ssl/server.key rename to docker/nginx/alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/.gitkeep rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.common.d/10-php.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.conf diff --git a/docker/nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/nginx/vhost.ssl.conf rename to docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf diff --git a/docker/nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf b/docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/alpine-php5/conf/etc/supervisor.d/nginx.conf rename to docker/nginx/alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml similarity index 100% rename from docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/defaults/main.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/defaults/main.yml diff --git a/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml similarity index 100% rename from docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/bootstrap.yml diff --git a/docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml b/docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml similarity index 100% rename from docker/nginx/alpine-php5/conf/provision/roles/webdevops-nginx/tasks/main.yml rename to docker/nginx/alpine/conf/provision/roles/webdevops-nginx/tasks/main.yml From 55c99568889d8cf204e1c6e9d67d450a98904ba3 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 11:33:36 +0200 Subject: [PATCH 44/58] Finally fix ipv6 and ipv4 support with serverspec --- tests/serverspec/spec/shared/hhvm/listening.rb | 4 ++-- tests/serverspec/spec/shared/php/fpm.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/serverspec/spec/shared/hhvm/listening.rb b/tests/serverspec/spec/shared/hhvm/listening.rb index ce0cd4a5f..fbfcc1f64 100644 --- a/tests/serverspec/spec/shared/hhvm/listening.rb +++ b/tests/serverspec/spec/shared/hhvm/listening.rb @@ -1,7 +1,7 @@ shared_examples 'hhvm::listening::public' do describe port(9000) do it "hhvm should be listening", :retry => 20, :retry_wait => 3 do - should be_listening.on('::') or be_listening.on('0.0.0.0') + should be_listening.on('::').or(be_listening.on('0.0.0.0')) end end end @@ -11,7 +11,7 @@ it "hhvm should be listening local", :retry => 20, :retry_wait => 3 do should_not be_listening.on('::') should_not be_listening.on('0.0.0.0') - should be_listening.on('::1') or be_listening.on('127.0.0.1') + should be_listening.on('::1').or(be_listening.on('127.0.0.1')) end end end diff --git a/tests/serverspec/spec/shared/php/fpm.rb b/tests/serverspec/spec/shared/php/fpm.rb index defb41443..33109ae98 100644 --- a/tests/serverspec/spec/shared/php/fpm.rb +++ b/tests/serverspec/spec/shared/php/fpm.rb @@ -38,7 +38,7 @@ shared_examples 'php-fpm::listening::public' do describe port(9000) do it "php-fpm should be listening", :retry => 10, :retry_wait => 3 do - should be_listening.on('::') or be_listening.on('0.0.0.0') + should be_listening.on('::').or(be_listening.on('0.0.0.0')) end end end @@ -48,7 +48,7 @@ it "php-fpm should be listening local", :retry => 10, :retry_wait => 3 do should_not be_listening.on('0.0.0.0') should_not be_listening.on('::') - should be_listening.on('::1') or be_listening.on('127.0.0.1') + should be_listening.on('::1').or(be_listening.on('127.0.0.1')) end end end From 13825ae874464127c4065ac6027c75898ff12846 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 11:35:28 +0200 Subject: [PATCH 45/58] Update dockerfile comments --- docker/ansible/alpine/Dockerfile | 2 +- docker/apache-dev/alpine/Dockerfile | 2 +- docker/apache/alpine/Dockerfile | 2 +- docker/base-app/alpine/Dockerfile | 2 +- docker/base/alpine/Dockerfile | 2 +- docker/bootstrap/alpine/Dockerfile | 2 +- docker/nginx-dev/alpine/Dockerfile | 2 +- docker/nginx/alpine/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 7cbff4b4e..802dc7fb4 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/ansible:alpine-php5 +# Dockerfile for webdevops/ansible:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index d990e59bb..6d7df958c 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache-dev:alpine-php5 +# Dockerfile for webdevops/apache-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index d383579dd..87257b1ab 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/apache:alpine-php5 +# Dockerfile for webdevops/apache:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index f02957225..e8b7229c3 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:alpine-php5 +# Dockerfile for webdevops/base-app:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index 9f89f58d9..e73ad3270 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:alpine-php5 +# Dockerfile for webdevops/base:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index 1470c6be9..a37ac69c0 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:alpine-php5 +# Dockerfile for webdevops/bootstrap:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 9aeb501a9..81cbdbb6d 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx-dev:alpine-php5 +# Dockerfile for webdevops/nginx-dev:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 58e747ae4..6e53db2b1 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -1,5 +1,5 @@ #+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/nginx:alpine-php5 +# Dockerfile for webdevops/nginx:alpine # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ From 05358a400eb9784a2ee1d0c07186bebe2f097963 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 11:35:51 +0200 Subject: [PATCH 46/58] Add supervisor password Get rid of warning message at container start --- docker/base/alpine/conf/etc/supervisor.conf | 7 +++++++ .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/debian-7/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/debian-8/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/debian-9/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-12.04/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-14.04/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-15.04/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-15.10/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-16.04/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/base/ubuntu-16.10/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/php-official/5.6/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/php-official/7.0/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/php-official/7.1/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ docker/samson-deployment/latest/conf/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ provisioning/base/alpine/etc/supervisor.conf | 7 +++++++ provisioning/base/general/etc/supervisor.conf | 9 +++++++-- .../roles/webdevops-base/tasks/bootstrap/supervisor.yml | 7 +++++++ 32 files changed, 224 insertions(+), 28 deletions(-) diff --git a/docker/base/alpine/conf/etc/supervisor.conf b/docker/base/alpine/conf/etc/supervisor.conf index 14a6223fc..fadeb33e8 100644 --- a/docker/base/alpine/conf/etc/supervisor.conf +++ b/docker/base/alpine/conf/etc/supervisor.conf @@ -3,6 +3,13 @@ nodaemon=true [unix_http_server] file = /run/supervisord.sock +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///run/supervisord.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/base/debian-7/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/debian-7/conf/etc/supervisor.conf +++ b/docker/base/debian-7/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/base/debian-8/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/debian-8/conf/etc/supervisor.conf +++ b/docker/base/debian-8/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/base/debian-9/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/debian-9/conf/etc/supervisor.conf +++ b/docker/base/debian-9/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-16.10/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/php-official/5.6/conf/etc/supervisor.conf b/docker/php-official/5.6/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/php-official/5.6/conf/etc/supervisor.conf +++ b/docker/php-official/5.6/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/php-official/7.0/conf/etc/supervisor.conf b/docker/php-official/7.0/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/php-official/7.0/conf/etc/supervisor.conf +++ b/docker/php-official/7.0/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/php-official/7.1/conf/etc/supervisor.conf b/docker/php-official/7.1/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/php-official/7.1/conf/etc/supervisor.conf +++ b/docker/php-official/7.1/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.conf b/docker/samson-deployment/latest/conf/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/docker/samson-deployment/latest/conf/etc/supervisor.conf +++ b/docker/samson-deployment/latest/conf/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes diff --git a/provisioning/base/alpine/etc/supervisor.conf b/provisioning/base/alpine/etc/supervisor.conf index 14a6223fc..fadeb33e8 100644 --- a/provisioning/base/alpine/etc/supervisor.conf +++ b/provisioning/base/alpine/etc/supervisor.conf @@ -3,6 +3,13 @@ nodaemon=true [unix_http_server] file = /run/supervisord.sock +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///run/supervisord.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/provisioning/base/general/etc/supervisor.conf b/provisioning/base/general/etc/supervisor.conf index 7c109515a..0cb4c03cf 100644 --- a/provisioning/base/general/etc/supervisor.conf +++ b/provisioning/base/general/etc/supervisor.conf @@ -3,8 +3,13 @@ nodaemon=true [unix_http_server] file = /var/run/supervisor.sock -# username = root -# password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///var/run/supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml index bda0394b6..2ce07ac26 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/supervisor.yml @@ -4,3 +4,10 @@ file: path: '/usr/sbin/service' state: absent + +- name: Create link for supervisor.conf + file: + src: '/opt/docker/etc/supervisor.conf' + dest: '/etc/supervisord.conf' + state: link + force: yes From 653cbb65f7a522a04763361692d5b81545c0f82f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 11:36:41 +0200 Subject: [PATCH 47/58] Remove dependency for serverspec tests Provide faster tests by ignoring dependency --- bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 609843483..6a9ab049a 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -41,8 +41,8 @@ def generate_task_list(self, dockerfile_list): 'task_dep': [] } - if dockerfile['dependency']: - task['task_dep'].append('DockerTestServerspec|%s' % dockerfile['dependency']) + #if dockerfile['dependency']: + # task['task_dep'].append('DockerTestServerspec|%s' % dockerfile['dependency']) tasklist.append(task) From 440528fd2a55aa5fb2560d2155509dcab2d0933e Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 17:21:08 +0200 Subject: [PATCH 48/58] Unify supervisor.conf --- docker/base/alpine/conf/etc/supervisor.conf | 6 ++++-- .../base/centos-7/conf/etc/logrotate.d/syslog | 1 - docker/base/centos-7/conf/etc/supervisor.conf | 11 ++++++++++- docker/base/debian-7/conf/etc/supervisor.conf | 6 ++++-- docker/base/debian-8/conf/etc/supervisor.conf | 6 ++++-- docker/base/debian-9/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-12.04/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-14.04/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-15.04/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-15.10/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-16.04/conf/etc/supervisor.conf | 6 ++++-- .../base/ubuntu-16.10/conf/etc/supervisor.conf | 6 ++++-- .../php-official/5.6/conf/etc/supervisor.conf | 6 ++++-- .../php-official/7.0/conf/etc/supervisor.conf | 6 ++++-- .../php-official/7.1/conf/etc/supervisor.conf | 6 ++++-- .../latest/conf/etc/supervisor.conf | 6 ++++-- provisioning/base/alpine/etc/supervisor.conf | 18 ------------------ .../base/centos/etc/logrotate.d/syslog | 1 - provisioning/base/centos/etc/supervisor.conf | 11 ----------- provisioning/base/general/etc/supervisor.conf | 6 ++++-- 20 files changed, 70 insertions(+), 62 deletions(-) delete mode 100644 docker/base/centos-7/conf/etc/logrotate.d/syslog delete mode 100644 provisioning/base/alpine/etc/supervisor.conf delete mode 100644 provisioning/base/centos/etc/logrotate.d/syslog delete mode 100644 provisioning/base/centos/etc/supervisor.conf diff --git a/docker/base/alpine/conf/etc/supervisor.conf b/docker/base/alpine/conf/etc/supervisor.conf index fadeb33e8..479e0db08 100644 --- a/docker/base/alpine/conf/etc/supervisor.conf +++ b/docker/base/alpine/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /run/supervisord.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///run/supervisord.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/centos-7/conf/etc/logrotate.d/syslog b/docker/base/centos-7/conf/etc/logrotate.d/syslog deleted file mode 100644 index 4597c7b48..000000000 --- a/docker/base/centos-7/conf/etc/logrotate.d/syslog +++ /dev/null @@ -1 +0,0 @@ -# placeholder -> overwrite system default \ No newline at end of file diff --git a/docker/base/centos-7/conf/etc/supervisor.conf b/docker/base/centos-7/conf/etc/supervisor.conf index 440721076..479e0db08 100644 --- a/docker/base/centos-7/conf/etc/supervisor.conf +++ b/docker/base/centos-7/conf/etc/supervisor.conf @@ -2,7 +2,16 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root +username = root +password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 + +[supervisorctl] +serverurl = unix:///.supervisor.sock +username = root +password = docker [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/base/debian-7/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/debian-7/conf/etc/supervisor.conf +++ b/docker/base/debian-7/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/base/debian-8/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/debian-8/conf/etc/supervisor.conf +++ b/docker/base/debian-8/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/base/debian-9/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/debian-9/conf/etc/supervisor.conf +++ b/docker/base/debian-9/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-12.04/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-14.04/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.04/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-15.10/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-16.04/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.conf +++ b/docker/base/ubuntu-16.10/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/php-official/5.6/conf/etc/supervisor.conf b/docker/php-official/5.6/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/php-official/5.6/conf/etc/supervisor.conf +++ b/docker/php-official/5.6/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/php-official/7.0/conf/etc/supervisor.conf b/docker/php-official/7.0/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/php-official/7.0/conf/etc/supervisor.conf +++ b/docker/php-official/7.0/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/php-official/7.1/conf/etc/supervisor.conf b/docker/php-official/7.1/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/php-official/7.1/conf/etc/supervisor.conf +++ b/docker/php-official/7.1/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.conf b/docker/samson-deployment/latest/conf/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/docker/samson-deployment/latest/conf/etc/supervisor.conf +++ b/docker/samson-deployment/latest/conf/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker diff --git a/provisioning/base/alpine/etc/supervisor.conf b/provisioning/base/alpine/etc/supervisor.conf deleted file mode 100644 index fadeb33e8..000000000 --- a/provisioning/base/alpine/etc/supervisor.conf +++ /dev/null @@ -1,18 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /run/supervisord.sock -username = root -password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 - -[supervisorctl] -serverurl = unix:///run/supervisord.sock -username = root -password = docker - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/provisioning/base/centos/etc/logrotate.d/syslog b/provisioning/base/centos/etc/logrotate.d/syslog deleted file mode 100644 index 4597c7b48..000000000 --- a/provisioning/base/centos/etc/logrotate.d/syslog +++ /dev/null @@ -1 +0,0 @@ -# placeholder -> overwrite system default \ No newline at end of file diff --git a/provisioning/base/centos/etc/supervisor.conf b/provisioning/base/centos/etc/supervisor.conf deleted file mode 100644 index 440721076..000000000 --- a/provisioning/base/centos/etc/supervisor.conf +++ /dev/null @@ -1,11 +0,0 @@ -[supervisord] -nodaemon=true - -[unix_http_server] -file = /var/run/supervisor/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[include] -files = /opt/docker/etc/supervisor.d/*.conf diff --git a/provisioning/base/general/etc/supervisor.conf b/provisioning/base/general/etc/supervisor.conf index 0cb4c03cf..479e0db08 100644 --- a/provisioning/base/general/etc/supervisor.conf +++ b/provisioning/base/general/etc/supervisor.conf @@ -2,12 +2,14 @@ nodaemon=true [unix_http_server] -file = /var/run/supervisor.sock +file = /.supervisor.sock +chmod = 0700 +chown = root:root username = root password = {SHA}e982f17bcbe0f724063b708a4f76db211a999304 [supervisorctl] -serverurl = unix:///var/run/supervisor.sock +serverurl = unix:///.supervisor.sock username = root password = docker From 0bcf4b50f81900ae89d05b76afa27f373340ddcd Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 20:26:14 +0200 Subject: [PATCH 49/58] Fix wrong alpine-php5 dependency --- docker/php-apache-dev/alpine-php5/Dockerfile | 2 +- docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 | 2 +- docker/php-apache/alpine-php5/Dockerfile | 2 +- docker/php-apache/alpine-php5/Dockerfile.jinja2 | 2 +- docker/php-dev/alpine-php5/Dockerfile | 2 +- docker/php-dev/alpine-php5/Dockerfile.jinja2 | 2 +- docker/php-nginx-dev/alpine-php5/Dockerfile | 2 +- docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 | 2 +- docker/php-nginx/alpine-php5/Dockerfile | 2 +- docker/php-nginx/alpine-php5/Dockerfile.jinja2 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile b/docker/php-apache-dev/alpine-php5/Dockerfile index c8c60ba9d..77cae4762 100644 --- a/docker/php-apache-dev/alpine-php5/Dockerfile +++ b/docker/php-apache-dev/alpine-php5/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine +FROM webdevops/php-dev:alpine-php5 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 index cc42d96c7..f18d03f22 100644 --- a/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 +++ b/docker/php-apache-dev/alpine-php5/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine") }} +{{ docker.from("php-dev", "alpine-php5") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-apache/alpine-php5/Dockerfile b/docker/php-apache/alpine-php5/Dockerfile index ea79aefdd..4c3756675 100644 --- a/docker/php-apache/alpine-php5/Dockerfile +++ b/docker/php-apache/alpine-php5/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine +FROM webdevops/php:alpine-php5 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-apache/alpine-php5/Dockerfile.jinja2 b/docker/php-apache/alpine-php5/Dockerfile.jinja2 index 767944c03..687d88290 100644 --- a/docker/php-apache/alpine-php5/Dockerfile.jinja2 +++ b/docker/php-apache/alpine-php5/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine") }} +{{ docker.from("php", "alpine-php5") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-dev/alpine-php5/Dockerfile b/docker/php-dev/alpine-php5/Dockerfile index c454438d0..528840fc8 100644 --- a/docker/php-dev/alpine-php5/Dockerfile +++ b/docker/php-dev/alpine-php5/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine +FROM webdevops/php:alpine-php5 COPY conf/ /opt/docker/ diff --git a/docker/php-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-dev/alpine-php5/Dockerfile.jinja2 index 298a76f38..5a19e8b50 100644 --- a/docker/php-dev/alpine-php5/Dockerfile.jinja2 +++ b/docker/php-dev/alpine-php5/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine") }} +{{ docker.from("php", "alpine-php5") }} {{ docker.copy('conf/', '/opt/docker/') }} diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile b/docker/php-nginx-dev/alpine-php5/Dockerfile index 3b317b3ed..67fc7b31f 100644 --- a/docker/php-nginx-dev/alpine-php5/Dockerfile +++ b/docker/php-nginx-dev/alpine-php5/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php-dev:alpine +FROM webdevops/php-dev:alpine-php5 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 index 7dc805242..5d4708d9e 100644 --- a/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/alpine-php5/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php-dev", "alpine") }} +{{ docker.from("php-dev", "alpine-php5") }} {{ environment.web() }} {{ environment.webPhp() }} diff --git a/docker/php-nginx/alpine-php5/Dockerfile b/docker/php-nginx/alpine-php5/Dockerfile index 7ae8ecf2b..91e6e269a 100644 --- a/docker/php-nginx/alpine-php5/Dockerfile +++ b/docker/php-nginx/alpine-php5/Dockerfile @@ -3,7 +3,7 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/php:alpine +FROM webdevops/php:alpine-php5 ENV WEB_DOCUMENT_ROOT=/app \ WEB_DOCUMENT_INDEX=index.php \ diff --git a/docker/php-nginx/alpine-php5/Dockerfile.jinja2 b/docker/php-nginx/alpine-php5/Dockerfile.jinja2 index ade6a9fe9..fffeb1d1b 100644 --- a/docker/php-nginx/alpine-php5/Dockerfile.jinja2 +++ b/docker/php-nginx/alpine-php5/Dockerfile.jinja2 @@ -1,4 +1,4 @@ -{{ docker.from("php", "alpine") }} +{{ docker.from("php", "alpine-php5") }} {{ environment.web() }} {{ environment.webPhp() }} From a976afbd1dc9297fd0d5956a0146b02929636f6f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 21:38:40 +0200 Subject: [PATCH 50/58] Fix alpine test environment settings --- tests/serverspec/spec/spec_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/serverspec/spec/spec_config.rb b/tests/serverspec/spec/spec_config.rb index e7012a39e..1eae3ccc3 100644 --- a/tests/serverspec/spec/spec_config.rb +++ b/tests/serverspec/spec/spec_config.rb @@ -49,8 +49,8 @@ (os[:family] == 'redhat' and os[:version] == '7') or (os[:family] == 'debian' and os[:version] == '7') or (os[:family] == 'debian' and os[:version] == '8') or - (os[:family] == 'alpine' and os[:version] == '3') or (ENV['DOCKER_TAG'].match('php5')) or + (ENV['DOCKER_TAG'].match('alpine-3')) or (ENV['DOCKER_TAG'] =~ /^5\.[0-9]+/) ) $testConfiguration[:php] = 5 From 6a9eb36b2897323b774c66759d142d15f195e7c3 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Mon, 10 Apr 2017 23:05:42 +0200 Subject: [PATCH 51/58] Print internal configuration hash in serverspec --- tests/serverspec/spec/spec_init.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/serverspec/spec/spec_init.rb b/tests/serverspec/spec/spec_init.rb index 5dff3719c..c23bb6e55 100644 --- a/tests/serverspec/spec/spec_init.rb +++ b/tests/serverspec/spec/spec_init.rb @@ -10,6 +10,12 @@ print "------------------------\n" print " DOCKERIMAGE_ID: " + ENV['DOCKERIMAGE_ID'] + "\n" print " DOCKER_IMAGE: " + ENV['DOCKER_IMAGE'] + "\n" +print " DOCKER_TAG: " + ENV['DOCKER_TAG'] + "\n" print " OS_FAMILY: " + ENV['OS_FAMILY'] + "\n" print " OS_VERSION: " + ENV['OS_VERSION'] + "\n" print "\n" +print "--- internal config -----\n" +$testConfiguration.each {|key, value| puts " #{key}: #{value}" } +print "\n" + + From 74408134539b6e5cacf304e28566078b2585d880 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 11 Apr 2017 01:10:17 +0200 Subject: [PATCH 52/58] Add reporting of task number --- bin/webdevops/doit/DoitReporter.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index 15f917b37..a924fd4f5 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -99,6 +99,8 @@ class DoitReporter(object): show_out = False show_err = False + task_finished = 0 + task_total = 0 def __init__(self, outstream, options=None): #pylint: disable=W0613 # result is sent to stdout when doit finishes running @@ -130,15 +132,19 @@ def execute_task(self, task): """ self.t_results[task.name].start() + def add_failure(self, task, exception): """ called when excution finishes with a failure """ self.t_results[task.name].set_result('fail', exception.get_msg()) + self.task_finished += 1 + if task.actions and (task.name[0] != '_'): duration = self.duration(self.t_results[task.name].elapsed) - self.writeln(colored('. %s FAILED (%s)' % (BaseTaskLoader.human_task_name(task.title()), duration), 'red')) + progress = self.calc_progress() + self.writeln(colored('. %s FAILED (%s, #%s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'red')) self.failures.append({'task': task, 'exception': exception}) def add_success(self, task): @@ -147,9 +153,12 @@ def add_success(self, task): """ self.t_results[task.name].set_result('success') + self.task_finished += 1 + if task.actions and (task.name[0] != '_'): duration = self.duration(self.t_results[task.name].elapsed) - self.writeln(colored('. %s finished (%s)' % (BaseTaskLoader.human_task_name(task.title()), duration), 'green')) + progress = self.calc_progress() + self.writeln(colored('. %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green')) def skip_uptodate(self, task): """ @@ -283,6 +292,9 @@ def duration(self, duration): """ return 'duration: %s' % str(datetime.timedelta(seconds=int(duration))) + def calc_progress(self): + return 'task #%s' % (self.task_finished) + def writeln(self, text=''): """ Output From 881fec1204916baf00d1aa71774da31976743f6b Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Tue, 11 Apr 2017 01:30:37 +0200 Subject: [PATCH 53/58] Show task progress in doit --- bin/webdevops/doit/DoitReporter.py | 3 ++- bin/webdevops/taskloader/BaseTaskLoader.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index a924fd4f5..5c767afd3 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -293,7 +293,8 @@ def duration(self, duration): return 'duration: %s' % str(datetime.timedelta(seconds=int(duration))) def calc_progress(self): - return 'task #%s' % (self.task_finished) + percentage = 100 * float(self.task_finished)/float(BaseTaskLoader.TASK_COUNT) + return 'task %s/%s, progress %d%%' % (self.task_finished, BaseTaskLoader.TASK_COUNT, percentage) def writeln(self, text=''): """ diff --git a/bin/webdevops/taskloader/BaseTaskLoader.py b/bin/webdevops/taskloader/BaseTaskLoader.py index 6a3aeed59..1f97a1cb5 100644 --- a/bin/webdevops/taskloader/BaseTaskLoader.py +++ b/bin/webdevops/taskloader/BaseTaskLoader.py @@ -23,8 +23,11 @@ from doit.cmd_base import TaskLoader from doit.task import dict_to_task + class BaseTaskLoader(TaskLoader): configuration = False + reporter = False + TASK_COUNT = 0 def __init__(self, configuration): """ @@ -33,7 +36,6 @@ def __init__(self, configuration): # Build configuration as namespace object self.configuration = configuration - def process_tasklist(self, tasklist): """ Process task list and create task objects @@ -44,6 +46,8 @@ def process_tasklist(self, tasklist): print 'Starting execution of %s tasks...' % (len(ret)) + BaseTaskLoader.TASK_COUNT = len(ret) + return ret From 3bc756cfe23ebf6765650df70a510af184cb584f Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 13 Apr 2017 19:36:53 +0200 Subject: [PATCH 54/58] Add skipped task detection to doit reporter --- bin/webdevops/doit/DoitReporter.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index 5c767afd3..f5b74f7e2 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -156,9 +156,15 @@ def add_success(self, task): self.task_finished += 1 if task.actions and (task.name[0] != '_'): - duration = self.duration(self.t_results[task.name].elapsed) + durationSeconds = self.t_results[task.name].elapsed + duration = self.duration(durationSeconds) progress = self.calc_progress() - self.writeln(colored('. %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green')) + + if durationSeconds >= 2: + self.writeln(colored('. %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green')) + else: + self.writeln(colored( + '. %s SKIPPED (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'yellow')) def skip_uptodate(self, task): """ From 7e1efc35ce244befba163cf00edaebbe6eb37bf8 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Thu, 13 Apr 2017 20:13:28 +0200 Subject: [PATCH 55/58] Add simulation message to doit Used for --dry-run Improved also skipped detection --- bin/webdevops/command/BaseCommand.py | 3 +++ bin/webdevops/doit/DoitReporter.py | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/bin/webdevops/command/BaseCommand.py b/bin/webdevops/command/BaseCommand.py index ba7bb0137..6734f5917 100644 --- a/bin/webdevops/command/BaseCommand.py +++ b/bin/webdevops/command/BaseCommand.py @@ -23,6 +23,7 @@ import multiprocessing from cleo import Command from webdevops import Configuration +from ..doit.DoitReporter import DoitReporter class BaseCommand(Command): configuration = False @@ -86,6 +87,8 @@ def startup(self): if 'dryRun' in self.configuration and self.configuration.get('dryRun'): options.append('dry-run') + DoitReporter.simulation_mode = True + print 'Executing %s (%s)' % (self.name, ', '.join(options)) print '' diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index f5b74f7e2..273c94824 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -95,6 +95,9 @@ class DoitReporter(object): output results after finish """ + skip_detection = True + simulation_mode = False + desc = 'output after finish' show_out = False @@ -160,11 +163,19 @@ def add_success(self, task): duration = self.duration(durationSeconds) progress = self.calc_progress() - if durationSeconds >= 2: - self.writeln(colored('. %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green')) + if DoitReporter.simulation_mode: + self.writeln( + colored('. %s simulated (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'blue') + ) else: - self.writeln(colored( - '. %s SKIPPED (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'yellow')) + if DoitReporter.skip_detection and durationSeconds < 1: + self.writeln( + colored('. %s SKIPPED (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'yellow') + ) + else: + self.writeln( + colored('. %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green') + ) def skip_uptodate(self, task): """ From b875b6bba72773a48e4391a02384a7268d34c424 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Fri, 14 Apr 2017 20:38:34 +0200 Subject: [PATCH 56/58] Refactoring and cleanup - Remove full path for docker-image-cleanup - Add webdevops/dockerfile-build-env (build environment for Dockerfile repository) - Add new docker-image-info command to gather information of current image - Restore default locale - Remove editors (moved to -dev images) - Replace php:5.6, php:7.0 and php:7.1 with symlink (automatic duplication detection, avoid duplicate test running) - Improve duplication checks for images (skip duplicate serverspec tests, but in build fail if source is not available) - Remove provision.sh test - Remove logwatch.sh - Remove logwatch - Improve service provisioning - Remove sudo - Remove syslog (provision on demand with 'docker-service-enable syslog') - Cleanup entrypoint and scripts - Only run entrypoint provision if roles are available (skip python task) --- baselayout/usr/local/bin/docker-image-cleanup | 2 +- baselayout/usr/local/bin/docker-image-info | 87 ++++++++++++++++++ .../usr/local/bin/generate-dockerimage-info | 33 +++---- baselayout/usr/local/bin/generate-locales | 21 +++-- bin/webdevops/DockerfileUtility.py | 6 +- bin/webdevops/doit/DoitReporter.py | 15 +-- .../taskloader/DockerBuildTaskLoader.py | 7 ++ .../DockerTestServerspecTaskLoader.py | 8 ++ docker/ansible/alpine/Dockerfile | 2 +- docker/ansible/centos-7/Dockerfile | 2 +- docker/ansible/debian-7/Dockerfile | 2 +- docker/ansible/debian-8/Dockerfile | 2 +- docker/ansible/debian-9/Dockerfile | 2 +- docker/ansible/ubuntu-12.04/Dockerfile | 2 +- docker/ansible/ubuntu-14.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.04/Dockerfile | 2 +- docker/ansible/ubuntu-15.10/Dockerfile | 2 +- docker/ansible/ubuntu-16.04/Dockerfile | 2 +- docker/apache-dev/alpine/Dockerfile | 2 +- docker/apache-dev/centos-7/Dockerfile | 2 +- docker/apache-dev/debian-7/Dockerfile | 2 +- docker/apache-dev/debian-8/Dockerfile | 2 +- docker/apache-dev/debian-9/Dockerfile | 2 +- docker/apache-dev/ubuntu-12.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-14.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-15.10/Dockerfile | 2 +- docker/apache-dev/ubuntu-16.04/Dockerfile | 2 +- docker/apache-dev/ubuntu-16.10/Dockerfile | 2 +- docker/apache/alpine/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/centos-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-8/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/debian-9/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-12.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-14.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-15.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-15.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-16.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/apache/ubuntu-16.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/base-app/alpine/Dockerfile | 5 +- docker/base-app/centos-7/Dockerfile | 5 +- docker/base-app/debian-7/Dockerfile | 5 +- docker/base-app/debian-8/Dockerfile | 5 +- docker/base-app/debian-9/Dockerfile | 5 +- docker/base-app/ubuntu-12.04/Dockerfile | 5 +- docker/base-app/ubuntu-14.04/Dockerfile | 5 +- docker/base-app/ubuntu-15.04/Dockerfile | 5 +- docker/base-app/ubuntu-15.10/Dockerfile | 5 +- docker/base-app/ubuntu-16.04/Dockerfile | 5 +- docker/base-app/ubuntu-16.10/Dockerfile | 5 +- docker/base/alpine/Dockerfile | 5 +- docker/base/alpine/conf/bin/bootstrap.sh | 20 +++- docker/base/alpine/conf/bin/config.sh | 60 ++++-------- .../base/alpine/conf/bin/entrypoint.d/cli.sh | 2 +- .../base/alpine/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - docker/base/alpine/conf/bin/entrypoint.sh | 15 +-- docker/base/alpine/conf/bin/provision.sh | 30 ------ .../{logwatch.sh => usr-bin/docker-provision} | 9 +- .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog.conf} | 2 +- .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../alpine/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../alpine/conf/provision/service.d/ssh.sh | 2 + .../alpine/conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../base/alpine/conf/provision/variables.yml | 10 +- docker/base/centos-7/Dockerfile | 5 +- docker/base/centos-7/conf/bin/bootstrap.sh | 20 +++- docker/base/centos-7/conf/bin/config.sh | 60 ++++-------- .../centos-7/conf/bin/entrypoint.d/cli.sh | 2 +- .../centos-7/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - docker/base/centos-7/conf/bin/entrypoint.sh | 15 +-- docker/base/centos-7/conf/bin/provision.sh | 30 ------ .../{logwatch.sh => usr-bin/docker-provision} | 9 +- .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog.conf} | 2 +- .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../centos-7/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../centos-7/conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../centos-7/conf/provision/variables.yml | 10 +- docker/base/debian-7/Dockerfile | 6 +- docker/base/debian-7/conf/bin/bootstrap.sh | 20 +++- docker/base/debian-7/conf/bin/config.sh | 60 ++++-------- .../debian-7/conf/bin/entrypoint.d/cli.sh | 2 +- .../debian-7/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - docker/base/debian-7/conf/bin/entrypoint.sh | 15 +-- docker/base/debian-7/conf/bin/provision.sh | 30 ------ .../{logwatch.sh => usr-bin/docker-provision} | 9 +- .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog.conf} | 2 +- .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../debian-7/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../debian-7/conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../debian-7/conf/provision/variables.yml | 10 +- docker/base/debian-8/Dockerfile | 6 +- docker/base/debian-8/conf/bin/bootstrap.sh | 20 +++- docker/base/debian-8/conf/bin/config.sh | 60 ++++-------- .../debian-8/conf/bin/entrypoint.d/cli.sh | 2 +- .../debian-8/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - docker/base/debian-8/conf/bin/entrypoint.sh | 15 +-- docker/base/debian-8/conf/bin/provision.sh | 30 ------ .../{logwatch.sh => usr-bin/docker-provision} | 9 +- .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog.conf} | 2 +- .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../debian-8/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../debian-8/conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../debian-8/conf/provision/variables.yml | 10 +- docker/base/debian-9/Dockerfile | 6 +- docker/base/debian-9/conf/bin/bootstrap.sh | 20 +++- docker/base/debian-9/conf/bin/config.sh | 60 ++++-------- .../debian-9/conf/bin/entrypoint.d/cli.sh | 2 +- .../debian-9/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - docker/base/debian-9/conf/bin/entrypoint.sh | 15 +-- docker/base/debian-9/conf/bin/logwatch.sh | 14 --- docker/base/debian-9/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../debian-9/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../debian-9/conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../debian-9/conf/provision/variables.yml | 10 +- docker/base/ubuntu-12.04/Dockerfile | 6 +- .../base/ubuntu-12.04/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-12.04/conf/bin/config.sh | 60 ++++-------- .../ubuntu-12.04/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-12.04/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-12.04/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-12.04/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-12.04/conf/provision/variables.yml | 10 +- docker/base/ubuntu-14.04/Dockerfile | 6 +- .../base/ubuntu-14.04/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-14.04/conf/bin/config.sh | 60 ++++-------- .../ubuntu-14.04/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-14.04/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-14.04/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-14.04/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-14.04/conf/provision/variables.yml | 10 +- docker/base/ubuntu-15.04/Dockerfile | 6 +- .../base/ubuntu-15.04/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-15.04/conf/bin/config.sh | 60 ++++-------- .../ubuntu-15.04/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-15.04/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-15.04/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-15.04/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-15.04/conf/provision/variables.yml | 10 +- docker/base/ubuntu-15.10/Dockerfile | 6 +- .../base/ubuntu-15.10/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-15.10/conf/bin/config.sh | 60 ++++-------- .../ubuntu-15.10/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-15.10/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-15.10/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-15.10/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-15.10/conf/provision/variables.yml | 10 +- docker/base/ubuntu-16.04/Dockerfile | 6 +- .../base/ubuntu-16.04/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-16.04/conf/bin/config.sh | 60 ++++-------- .../ubuntu-16.04/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-16.04/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-16.04/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-16.04/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-16.04/conf/provision/variables.yml | 10 +- docker/base/ubuntu-16.10/Dockerfile | 6 +- .../base/ubuntu-16.10/conf/bin/bootstrap.sh | 20 +++- docker/base/ubuntu-16.10/conf/bin/config.sh | 60 ++++-------- .../ubuntu-16.10/conf/bin/entrypoint.d/cli.sh | 2 +- .../conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../base/ubuntu-16.10/conf/bin/entrypoint.sh | 15 +-- docker/base/ubuntu-16.10/conf/bin/logwatch.sh | 14 --- .../base/ubuntu-16.10/conf/bin/provision.sh | 30 ------ .../conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../conf/provision/service.d/ssh.sh | 2 + .../conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../ubuntu-16.10/conf/provision/variables.yml | 10 +- docker/bootstrap/alpine/Dockerfile | 8 +- docker/bootstrap/alpine/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/centos-7/Dockerfile | 8 +- docker/bootstrap/centos-7/Dockerfile.jinja2 | 2 +- docker/bootstrap/centos-7/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/debian-7/Dockerfile | 13 +-- docker/bootstrap/debian-7/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/debian-8/Dockerfile | 13 +-- docker/bootstrap/debian-8/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/debian-9/Dockerfile | 13 +-- docker/bootstrap/debian-9/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-12.04/Dockerfile | 10 +- docker/bootstrap/ubuntu-12.04/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-14.04/Dockerfile | 10 +- docker/bootstrap/ubuntu-14.04/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-15.04/Dockerfile | 10 +- docker/bootstrap/ubuntu-15.04/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-15.10/Dockerfile | 10 +- docker/bootstrap/ubuntu-15.10/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-16.04/Dockerfile | 10 +- docker/bootstrap/ubuntu-16.04/baselayout.tar | Bin 9100 -> 9605 bytes docker/bootstrap/ubuntu-16.10/Dockerfile | 10 +- docker/bootstrap/ubuntu-16.10/baselayout.tar | Bin 9100 -> 9605 bytes docker/certbot/latest/Dockerfile | 2 +- docker/dockerfile-build-env/latest/Dockerfile | 47 ++++++++++ .../latest/Dockerfile.jinja2 | 42 +++++++++ docker/hhvm-apache/ubuntu-14.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/hhvm-apache/ubuntu-16.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/hhvm-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/hhvm-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/hhvm/ubuntu-14.04/Dockerfile | 4 +- docker/hhvm/ubuntu-16.04/Dockerfile | 2 +- docker/liquidsoap/latest/Dockerfile | 2 +- docker/mail-sandbox/latest/Dockerfile | 4 +- docker/nginx-dev/alpine/Dockerfile | 2 +- docker/nginx-dev/centos-7/Dockerfile | 2 +- docker/nginx-dev/debian-7/Dockerfile | 2 +- docker/nginx-dev/debian-8/Dockerfile | 2 +- docker/nginx-dev/debian-9/Dockerfile | 2 +- docker/nginx-dev/ubuntu-12.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-14.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-15.10/Dockerfile | 2 +- docker/nginx-dev/ubuntu-16.04/Dockerfile | 2 +- docker/nginx-dev/ubuntu-16.10/Dockerfile | 2 +- docker/nginx/alpine/Dockerfile | 2 +- docker/nginx/centos-7/Dockerfile | 2 +- docker/nginx/debian-7/Dockerfile | 2 +- docker/nginx/debian-8/Dockerfile | 2 +- docker/nginx/debian-9/Dockerfile | 2 +- docker/nginx/ubuntu-12.04/Dockerfile | 2 +- docker/nginx/ubuntu-14.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.04/Dockerfile | 2 +- docker/nginx/ubuntu-15.10/Dockerfile | 2 +- docker/nginx/ubuntu-16.04/Dockerfile | 2 +- docker/nginx/ubuntu-16.10/Dockerfile | 2 +- docker/php-apache-dev/5.6/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/7.0/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/7.1/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/alpine-php5/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/alpine-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/centos-7-php56/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/centos-7-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/centos-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-apache-dev/debian-8-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-8/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/debian-9/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-12.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-14.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-15.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-15.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-16.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache-dev/ubuntu-16.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-apache/5.6/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/7.0/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/7.1/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/alpine-php5/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/alpine-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7-php56/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/centos-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-8-php7/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-8/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/debian-9/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-12.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-14.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-15.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-15.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-16.04/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-apache/ubuntu-16.10/Dockerfile | 2 +- .../webdevops-apache/tasks/bootstrap.yml | 2 +- docker/php-dev/5.6/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/7.0/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/7.1/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/alpine-php5/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/alpine-php7/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7-php56/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7-php7/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/centos-7/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-7/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-8-php7/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-8/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/debian-9/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-12.04/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-14.04/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-15.04/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-15.10/Dockerfile | 8 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-16.04/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-dev/ubuntu-16.10/Dockerfile | 5 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/5.6/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/7.0/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/7.1/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/alpine-php5/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/alpine-php7/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- .../php-nginx-dev/centos-7-php56/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/centos-7-php7/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/centos-7/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-7/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-8-php7/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-8/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/debian-9/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-12.04/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-14.04/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-15.04/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-15.10/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-16.04/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx-dev/ubuntu-16.10/Dockerfile | 2 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- docker/php-nginx/5.6/Dockerfile | 2 +- docker/php-nginx/7.0/Dockerfile | 2 +- docker/php-nginx/7.1/Dockerfile | 2 +- docker/php-nginx/alpine-php5/Dockerfile | 2 +- docker/php-nginx/alpine-php7/Dockerfile | 2 +- docker/php-nginx/centos-7-php56/Dockerfile | 2 +- docker/php-nginx/centos-7-php7/Dockerfile | 2 +- docker/php-nginx/centos-7/Dockerfile | 2 +- docker/php-nginx/debian-7/Dockerfile | 2 +- docker/php-nginx/debian-8-php7/Dockerfile | 2 +- docker/php-nginx/debian-8/Dockerfile | 2 +- docker/php-nginx/debian-9/Dockerfile | 2 +- docker/php-nginx/ubuntu-12.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-14.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-15.10/Dockerfile | 2 +- docker/php-nginx/ubuntu-16.04/Dockerfile | 2 +- docker/php-nginx/ubuntu-16.10/Dockerfile | 2 +- docker/php-official/5.6/Dockerfile | 26 ++---- docker/php-official/5.6/baselayout.tar | Bin 9100 -> 9605 bytes docker/php-official/5.6/conf/bin/bootstrap.sh | 20 +++- docker/php-official/5.6/conf/bin/config.sh | 60 ++++-------- .../5.6/conf/bin/entrypoint.d/cli.sh | 2 +- .../5.6/conf/bin/entrypoint.d/noop.sh | 3 +- .../5.6/conf/bin/entrypoint.d/supervisord.sh | 2 - .../php-official/5.6/conf/bin/entrypoint.sh | 15 +-- docker/php-official/5.6/conf/bin/logwatch.sh | 14 --- docker/php-official/5.6/conf/bin/provision.sh | 30 ------ .../5.6/conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../5.6/conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../5.6/conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../5.6/conf/provision/service.d/cron.sh | 2 + .../5.6/conf/provision/service.d/dnsmasq.sh | 2 + .../5.6/conf/provision/service.d/postfix.sh | 2 + .../5.6/conf/provision/service.d/ssh.sh | 2 + .../5.6/conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../5.6/conf/provision/variables.yml | 10 +- docker/php-official/7.0/Dockerfile | 26 ++---- docker/php-official/7.0/baselayout.tar | Bin 9100 -> 9605 bytes docker/php-official/7.0/conf/bin/bootstrap.sh | 20 +++- docker/php-official/7.0/conf/bin/config.sh | 60 ++++-------- .../7.0/conf/bin/entrypoint.d/cli.sh | 2 +- .../7.0/conf/bin/entrypoint.d/noop.sh | 3 +- .../7.0/conf/bin/entrypoint.d/supervisord.sh | 2 - .../php-official/7.0/conf/bin/entrypoint.sh | 15 +-- docker/php-official/7.0/conf/bin/logwatch.sh | 14 --- docker/php-official/7.0/conf/bin/provision.sh | 30 ------ .../7.0/conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../7.0/conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../7.0/conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../7.0/conf/provision/service.d/cron.sh | 2 + .../7.0/conf/provision/service.d/dnsmasq.sh | 2 + .../7.0/conf/provision/service.d/postfix.sh | 2 + .../7.0/conf/provision/service.d/ssh.sh | 2 + .../7.0/conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../7.0/conf/provision/variables.yml | 10 +- docker/php-official/7.1/Dockerfile | 26 ++---- docker/php-official/7.1/baselayout.tar | Bin 9100 -> 9605 bytes docker/php-official/7.1/conf/bin/bootstrap.sh | 20 +++- docker/php-official/7.1/conf/bin/config.sh | 60 ++++-------- .../7.1/conf/bin/entrypoint.d/cli.sh | 2 +- .../7.1/conf/bin/entrypoint.d/noop.sh | 3 +- .../7.1/conf/bin/entrypoint.d/supervisord.sh | 2 - .../php-official/7.1/conf/bin/entrypoint.sh | 15 +-- docker/php-official/7.1/conf/bin/logwatch.sh | 14 --- docker/php-official/7.1/conf/bin/provision.sh | 30 ------ .../7.1/conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../7.1/conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../7.1/conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../7.1/conf/provision/service.d/cron.sh | 2 + .../7.1/conf/provision/service.d/dnsmasq.sh | 2 + .../7.1/conf/provision/service.d/postfix.sh | 2 + .../7.1/conf/provision/service.d/ssh.sh | 2 + .../7.1/conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../7.1/conf/provision/variables.yml | 10 +- docker/php/5.6 | 1 + docker/php/5.6/Dockerfile | 6 -- docker/php/5.6/Dockerfile.jinja2 | 1 - docker/php/7.0 | 1 + docker/php/7.0/Dockerfile | 6 -- docker/php/7.0/Dockerfile.jinja2 | 1 - docker/php/7.1 | 1 + docker/php/7.1/Dockerfile | 6 -- docker/php/7.1/Dockerfile.jinja2 | 1 - docker/php/alpine-php5/Dockerfile | 4 +- docker/php/alpine-php7/Dockerfile | 4 +- docker/php/centos-7-php56/Dockerfile | 4 +- docker/php/centos-7-php7/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/php/ubuntu-16.10/Dockerfile | 4 +- docker/postfix/latest/Dockerfile | 4 +- docker/samson-deployment/latest/Dockerfile | 32 +++---- .../samson-deployment/latest/baselayout.tar | Bin 9100 -> 9605 bytes .../latest/conf/bin/bootstrap.sh | 20 +++- .../latest/conf/bin/config.sh | 60 ++++-------- .../latest/conf/bin/entrypoint.d/cli.sh | 2 +- .../latest/conf/bin/entrypoint.d/noop.sh | 3 +- .../conf/bin/entrypoint.d/supervisord.sh | 2 - .../latest/conf/bin/entrypoint.sh | 15 +-- .../latest/conf/bin/logwatch.sh | 14 --- .../latest/conf/bin/provision.sh | 30 ------ .../latest/conf/bin/usr-bin/docker-provision | 9 ++ .../conf/bin/usr-bin/docker-service-disable | 2 +- .../conf/bin/usr-bin/docker-service-enable | 2 +- .../conf/etc/supervisor.d/syslog-ng.conf | 13 --- .../latest/conf/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../latest/conf/provision/service.d/cron.sh | 2 + .../conf/provision/service.d/dnsmasq.sh | 2 + .../conf/provision/service.d/postfix.sh | 2 + .../latest/conf/provision/service.d/ssh.sh | 2 + .../latest/conf/provision/service.d/syslog.sh | 41 +++++++++ .../conf/provision/variables-webdevops.yml | 10 +- .../latest/conf/provision/variables.yml | 10 +- docker/sphinx/latest/Dockerfile | 2 +- docker/ssh/latest/Dockerfile | 2 +- docker/typo3-solr/3.1/Dockerfile.jinja2 | 2 +- docker/typo3-solr/3.1/baselayout.tar | Bin 9100 -> 9605 bytes docker/typo3-solr/5.0/Dockerfile | 2 +- docker/typo3-solr/5.0/Dockerfile.jinja2 | 2 +- docker/typo3-solr/5.0/baselayout.tar | Bin 9100 -> 9605 bytes docker/typo3-solr/6.0/Dockerfile | 2 +- docker/typo3-solr/6.0/Dockerfile.jinja2 | 2 +- docker/typo3-solr/6.0/baselayout.tar | Bin 9100 -> 9605 bytes docker/varnish/latest/Dockerfile | 2 +- docker/vsftp/latest/Dockerfile | 2 +- foo | 1 + .../webdevops-apache/tasks/bootstrap.yml | 2 +- provisioning/base/general/bin/bootstrap.sh | 20 +++- provisioning/base/general/bin/config.sh | 60 ++++-------- .../base/general/bin/entrypoint.d/cli.sh | 2 +- .../base/general/bin/entrypoint.d/noop.sh | 3 +- .../general/bin/entrypoint.d/supervisord.sh | 2 - provisioning/base/general/bin/entrypoint.sh | 15 +-- provisioning/base/general/bin/logwatch.sh | 14 --- provisioning/base/general/bin/provision.sh | 30 ------ .../base/general/bin/usr-bin/docker-provision | 9 ++ .../bin/usr-bin/docker-service-disable | 2 +- .../general/bin/usr-bin/docker-service-enable | 2 +- .../general/etc/supervisor.d/syslog-ng.conf | 13 --- .../base/general/etc/supervisor.d/syslog.conf | 13 +++ .../roles/webdevops-base/tasks/bootstrap.yml | 2 +- .../tasks/bootstrap/entrypoint.yml | 8 ++ .../tasks/bootstrap/syslog-ng.yml | 33 ------- .../base/general/provision/service.d/cron.sh | 2 + .../general/provision/service.d/dnsmasq.sh | 2 + .../general/provision/service.d/postfix.sh | 2 + .../base/general/provision/service.d/ssh.sh | 2 + .../general/provision/service.d/syslog.sh | 41 +++++++++ .../general/provision/variables-webdevops.yml | 10 +- .../base/general/provision/variables.yml | 10 +- .../tasks/bootstrap/php-module.blackfire.yml | 2 +- template/Dockerfile/docker.jinja2 | 2 +- template/Dockerfile/environment.jinja2 | 2 +- template/Dockerfile/images/base.jinja2 | 6 -- template/Dockerfile/images/baseapp.jinja2 | 15 --- template/Dockerfile/images/bootstrap.jinja2 | 19 +--- template/Dockerfile/images/hhvm.jinja2 | 2 +- template/Dockerfile/images/php5-dev.jinja2 | 15 +++ template/Dockerfile/images/postfix.jinja2 | 2 +- .../images/samson-deployment.jinja2 | 2 +- template/Dockerfile/services.jinja2 | 5 +- tests/serverspec/Gemfile.lock | 10 +- tests/serverspec/spec/collection/base.rb | 1 - tests/serverspec/spec/shared/base/layout.rb | 5 +- .../spec/shared/bootstrap/distribution.rb | 82 ++++++++++++++++- 733 files changed, 2879 insertions(+), 3211 deletions(-) create mode 100755 baselayout/usr/local/bin/docker-image-info delete mode 100644 docker/base/alpine/conf/bin/provision.sh rename docker/base/alpine/conf/bin/{logwatch.sh => usr-bin/docker-provision} (68%) rename docker/base/{debian-7/conf/etc/supervisor.d/syslog-ng.conf => alpine/conf/etc/supervisor.d/syslog.conf} (93%) create mode 100644 docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/alpine/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/centos-7/conf/bin/provision.sh rename docker/base/centos-7/conf/bin/{logwatch.sh => usr-bin/docker-provision} (68%) rename docker/base/{debian-8/conf/etc/supervisor.d/syslog-ng.conf => centos-7/conf/etc/supervisor.d/syslog.conf} (93%) create mode 100644 docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/centos-7/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-7/conf/bin/provision.sh rename docker/base/debian-7/conf/bin/{logwatch.sh => usr-bin/docker-provision} (68%) rename docker/base/{alpine/conf/etc/supervisor.d/syslog-ng.conf => debian-7/conf/etc/supervisor.d/syslog.conf} (93%) create mode 100644 docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/debian-7/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-8/conf/bin/provision.sh rename docker/base/debian-8/conf/bin/{logwatch.sh => usr-bin/docker-provision} (68%) rename docker/base/{centos-7/conf/etc/supervisor.d/syslog-ng.conf => debian-8/conf/etc/supervisor.d/syslog.conf} (93%) create mode 100644 docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/debian-8/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/debian-9/conf/bin/logwatch.sh delete mode 100644 docker/base/debian-9/conf/bin/provision.sh create mode 100644 docker/base/debian-9/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/debian-9/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/debian-9/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/debian-9/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-12.04/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-14.04/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-15.04/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-15.10/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-16.04/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/logwatch.sh delete mode 100644 docker/base/ubuntu-16.10/conf/bin/provision.sh create mode 100644 docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision delete mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh create mode 100644 docker/dockerfile-build-env/latest/Dockerfile create mode 100644 docker/dockerfile-build-env/latest/Dockerfile.jinja2 delete mode 100644 docker/php-official/5.6/conf/bin/logwatch.sh delete mode 100644 docker/php-official/5.6/conf/bin/provision.sh create mode 100644 docker/php-official/5.6/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/5.6/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.0/conf/bin/logwatch.sh delete mode 100644 docker/php-official/7.0/conf/bin/provision.sh create mode 100644 docker/php-official/7.0/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/7.0/conf/provision/service.d/syslog.sh delete mode 100644 docker/php-official/7.1/conf/bin/logwatch.sh delete mode 100644 docker/php-official/7.1/conf/bin/provision.sh create mode 100644 docker/php-official/7.1/conf/bin/usr-bin/docker-provision delete mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/php-official/7.1/conf/provision/service.d/syslog.sh create mode 120000 docker/php/5.6 delete mode 100644 docker/php/5.6/Dockerfile delete mode 100644 docker/php/5.6/Dockerfile.jinja2 create mode 120000 docker/php/7.0 delete mode 100644 docker/php/7.0/Dockerfile delete mode 100644 docker/php/7.0/Dockerfile.jinja2 create mode 120000 docker/php/7.1 delete mode 100644 docker/php/7.1/Dockerfile delete mode 100644 docker/php/7.1/Dockerfile.jinja2 delete mode 100644 docker/samson-deployment/latest/conf/bin/logwatch.sh delete mode 100644 docker/samson-deployment/latest/conf/bin/provision.sh create mode 100644 docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision delete mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/syslog-ng.conf create mode 100644 docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf create mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 docker/samson-deployment/latest/conf/provision/service.d/syslog.sh create mode 100644 foo delete mode 100644 provisioning/base/general/bin/logwatch.sh delete mode 100644 provisioning/base/general/bin/provision.sh create mode 100644 provisioning/base/general/bin/usr-bin/docker-provision delete mode 100644 provisioning/base/general/etc/supervisor.d/syslog-ng.conf create mode 100644 provisioning/base/general/etc/supervisor.d/syslog.conf create mode 100644 provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml delete mode 100644 provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml create mode 100644 provisioning/base/general/provision/service.d/syslog.sh diff --git a/baselayout/usr/local/bin/docker-image-cleanup b/baselayout/usr/local/bin/docker-image-cleanup index 97682c762..e63d1b3c4 100755 --- a/baselayout/usr/local/bin/docker-image-cleanup +++ b/baselayout/usr/local/bin/docker-image-cleanup @@ -3,7 +3,7 @@ set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -LSB_FAMILY=$(cat /etc/dockerimage_distribution_family) +LSB_FAMILY=$(docker-image-info family) case "$LSB_FAMILY" in Debian) diff --git a/baselayout/usr/local/bin/docker-image-info b/baselayout/usr/local/bin/docker-image-info new file mode 100755 index 000000000..fb9248fc2 --- /dev/null +++ b/baselayout/usr/local/bin/docker-image-info @@ -0,0 +1,87 @@ +#!/bin/sh + +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +help() { + if [ -n "$1" ]; then + echo "$1" + echo "" + fi + + echo "Usage: $0 " + echo "" + echo " Application arguments:" + echo " family Get distribution family" + echo " dist Get distribution name" + echo " dist-version Get distribution version" + echo " dist-release Get distribution release" + echo " dist-codename Get distribution codename" + echo " lsb Get lsb informations (if available)" + echo " lsb-desc Get lsb description (if available)" + echo " buildtime Get buildtime of docker image" + echo "" + + exit $2 + +} + +if [ "$#" -ne 1 ]; then + help "[ERROR] Invalid argument" 1 +fi + +INFO_FILE="" + +case "$1" in + dist-family|distribution-family|family) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_family + ;; + + dist|distribution) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution + ;; + + dist-version|distribution-version) + INFO_FILE=/opt/docker/etc/.registry/image_info_distribution_version + ;; + + dist-release|distribution-release) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_release + ;; + + dist-codename|distribution-codename) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_codename + ;; + + lsb) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb + ;; + + lsb-desc|lsb-description) + INFO_FILE=/opt/docker/etc/.registry/image_info_lsb_description + ;; + + buildtime) + INFO_FILE=/opt/docker/etc/.registry/image_info_buildtime + ;; + + help) + help "" 0 + ;; + + *) + help "[ERROR] Invalid argument" 1 + ;; +esac + +if [ -n "$INFO_FILE" ]; then + if [ -f "$INFO_FILE" ]; then + cat -- "$INFO_FILE" + else + echo "[ERROR] Infomation file $INFO_FILE not found!" + echo " Please run generate-dockerimage-info on docker image creation!" + exit 2 + fi +else + help "" 1 +fi diff --git a/baselayout/usr/local/bin/generate-dockerimage-info b/baselayout/usr/local/bin/generate-dockerimage-info index 40472742c..25417e0a4 100755 --- a/baselayout/usr/local/bin/generate-dockerimage-info +++ b/baselayout/usr/local/bin/generate-dockerimage-info @@ -50,31 +50,32 @@ esac ############################# echo "Detected $LSB_FAMILY" -echo "$LSB_FAMILY" > /etc/dockerimage_distribution_family -echo "$LSB_FAMILY" > /etc/dockerimage_distribution + +mkdir -p /opt/docker/etc/.registry/ +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution_family +echo "$LSB_FAMILY" > /opt/docker/etc/.registry/image_info_distribution +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Create all files -touch /etc/dockerimage_distribution_version -touch /etc/dockerimage_lsb -touch /etc/dockerimage_lsb_id -touch /etc/dockerimage_lsb_id -touch /etc/dockerimage_lsb_release -touch /etc/dockerimage_lsb_codename +touch /opt/docker/etc/.registry/image_info_distribution_version +touch /opt/docker/etc/.registry/image_info_lsb +touch /opt/docker/etc/.registry/image_info_lsb_description +touch /opt/docker/etc/.registry/image_info_lsb_release +touch /opt/docker/etc/.registry/image_info_lsb_codename # Collect distribution specific informations case "$LSB_FAMILY" in Debian|RedHat) - lsb_release -i -s > /etc/dockerimage_distribution - lsb_release -r -s > /etc/dockerimage_distribution_version - lsb_release -a > /etc/dockerimage_lsb - lsb_release -i -s > /etc/dockerimage_lsb_id - lsb_release -d -s > /etc/dockerimage_lsb_id - lsb_release -r -s > /etc/dockerimage_lsb_release - lsb_release -c -s > /etc/dockerimage_lsb_codename + lsb_release -i -s > /opt/docker/etc/.registry/image_info_distribution + lsb_release -r -s > /opt/docker/etc/.registry/image_info_distribution_version + lsb_release -a > /opt/docker/etc/.registry/image_info_lsb + lsb_release -d -s > /opt/docker/etc/.registry/image_info_lsb_description + lsb_release -r -s > /opt/docker/etc/.registry/image_info_lsb_release + lsb_release -c -s > /opt/docker/etc/.registry/image_info_lsb_codename ;; Alpine) - cat /etc/alpine-release > /etc/dockerimage_distribution_version + cat /etc/alpine-release > /opt/docker/etc/.registry/image_info_distribution_version ;; esac diff --git a/baselayout/usr/local/bin/generate-locales b/baselayout/usr/local/bin/generate-locales index c0fcf0330..505bf0786 100755 --- a/baselayout/usr/local/bin/generate-locales +++ b/baselayout/usr/local/bin/generate-locales @@ -5,14 +5,15 @@ set -o errtrace ## trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -LSB_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -LSB_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) +IMAGE_DISTRIBUTION_FAMILY=$(docker-image-info family) +IMAGE_DISTRIBUTION=$(docker-image-info distribution) +IMAGE_DISTRIBUTION_VERSION=$(docker-image-info distribution-version) ####################################### ## Debian ####################################### -if [[ "$LSB_DISTRIBUTION" == "Debian" ]]; then +if [[ "$IMAGE_DISTRIBUTION" == "Debian" ]]; then /usr/local/bin/apt-install locales-all fi @@ -20,8 +21,8 @@ fi ## Ubuntu ####################################### -if [[ "$LSB_DISTRIBUTION" == "Ubuntu" ]]; then - if [[ "$(echo $LSB_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then +if [[ "$IMAGE_DISTRIBUTION" == "Ubuntu" ]]; then + if [[ "$(echo $IMAGE_DISTRIBUTION_VERSION| cut -f 1 -d .)" -ge "16" ]]; then # Ubuntu 16.04 or later /usr/local/bin/apt-install locales-all else @@ -35,12 +36,12 @@ fi ## RedHat family ####################################### -function localedefdebug() { - echo $* - localedef "$@" -} +if [[ "$IMAGE_DISTRIBUTION_FAMILY" == "RedHat" ]]; then -if [[ -f /etc/redhat-release ]]; then + function localedefdebug() { + echo $* + localedef "$@" + } # Failing locales ## && localedefdebug -c -i bo_CN -f UTF-8 bo_CN.utf8 \ diff --git a/bin/webdevops/DockerfileUtility.py b/bin/webdevops/DockerfileUtility.py index b1cccb404..547dfe9f1 100644 --- a/bin/webdevops/DockerfileUtility.py +++ b/bin/webdevops/DockerfileUtility.py @@ -79,6 +79,8 @@ def parse_docker_info_from_path(path): image_name = (image_name_info['image'] if 'image' in image_name_info else '') image_tag = (image_name_info['tag'] if 'tag' in image_name_info else '') + image_is_duplicate = False + # check if path is linked if os.path.islink(os.path.dirname(path)): linked_image_name_info = ([m.groupdict() for m in path_regex.finditer(os.path.realpath(path))])[0] @@ -88,6 +90,7 @@ def parse_docker_info_from_path(path): linked_image_tag = (linked_image_name_info['tag'] if 'tag' in linked_image_name_info else '') image_from = image_prefix + linked_image_repository + '/' + linked_image_name + ':' + linked_image_tag + image_is_duplicate = True else: image_from = parse_dockerfile_from_statement(path) @@ -97,7 +100,8 @@ def parse_docker_info_from_path(path): 'tag': image_tag, 'repository': image_prefix + image_repository, 'imageName': image_name, - 'from': image_from + 'from': image_from, + 'duplicate': image_is_duplicate } return imageInfo diff --git a/bin/webdevops/doit/DoitReporter.py b/bin/webdevops/doit/DoitReporter.py index 273c94824..a347a0733 100644 --- a/bin/webdevops/doit/DoitReporter.py +++ b/bin/webdevops/doit/DoitReporter.py @@ -237,13 +237,14 @@ def complete_run(self): if 'FinishChain|' in task['name']: continue - self.task_stdout( - title=task['name'], - duration=task['elapsed'], - stdout=task['out'], - stderr=task['err'], - error=task['error'] - ) + if task['result'] != 'fail': + self.task_stdout( + title=task['name'], + duration=task['elapsed'], + stdout=task['out'], + stderr=task['err'], + error=task['error'] + ) # show failed tasks (at the end) for task in task_result_list: diff --git a/bin/webdevops/taskloader/DockerBuildTaskLoader.py b/bin/webdevops/taskloader/DockerBuildTaskLoader.py index 3ef95a450..470aeb3e5 100644 --- a/bin/webdevops/taskloader/DockerBuildTaskLoader.py +++ b/bin/webdevops/taskloader/DockerBuildTaskLoader.py @@ -59,6 +59,13 @@ def task_run(docker_client, dockerfile, configuration, task): Build one Dockerfile """ + # check if dockerfile is symlink, skipping tests if just a duplicate image + # image is using the same hashes + if dockerfile['image']['duplicate'] and not task.task_dep: + print ' Docker image %s is build from symlink but not included in build chain, please include %s' % (dockerfile['image']['fullname'], dockerfile['image']['from']) + print ' -> failing build' + return False + pull_parent_image = DockerfileUtility.check_if_base_image_needs_pull(dockerfile, configuration) if configuration.get('dryRun'): diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py index 6a9ab049a..f4f2c429a 100644 --- a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py +++ b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py @@ -61,6 +61,14 @@ def task_run(dockerfile, configuration, task): """ Run test """ + + # check if dockerfile is symlink, skipping tests if just a duplicate image + # image is using the same hashes + if dockerfile['image']['duplicate']: + print ' Docker image %s is build from symlink and duplicate of %s' % (dockerfile['image']['fullname'], dockerfile['image']['from']) + print ' -> skipping tests' + return True + # Check if current image is a toolimage (no daemon) is_toolimage = False for term in configuration.get('dockerTest.toolImages', {}): diff --git a/docker/ansible/alpine/Dockerfile b/docker/ansible/alpine/Dockerfile index 802dc7fb4..ec35128d8 100644 --- a/docker/ansible/alpine/Dockerfile +++ b/docker/ansible/alpine/Dockerfile @@ -25,4 +25,4 @@ RUN /usr/local/bin/apk-install \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index 369ea60d7..9d7ccdd29 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -25,4 +25,4 @@ RUN /usr/local/bin/yum-install \ && chmod 750 /usr/bin/ansible* \ # Cleanup && yum erase -y python-devel \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index 6ed71bda3..98ac51767 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -27,4 +27,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index 7c8603431..9dbc99f79 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -27,4 +27,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index 96eeb6ffc..0e77bb72f 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -27,4 +27,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 7267919f0..fe3bbbdc1 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -26,4 +26,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index bec13e7f2..edf666bb6 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -26,4 +26,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 3a7bcbffa..98f71b57e 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -26,4 +26,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index a9ea0c7a3..a9f00de2c 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -26,4 +26,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index a5fef54ad..3c00ba751 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -26,4 +26,4 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/apache-dev/alpine/Dockerfile b/docker/apache-dev/alpine/Dockerfile index 6d7df958c..022a18ddc 100644 --- a/docker/apache-dev/alpine/Dockerfile +++ b/docker/apache-dev/alpine/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile index 72d6bddb5..5f5527845 100644 --- a/docker/apache-dev/centos-7/Dockerfile +++ b/docker/apache-dev/centos-7/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile index 929fb96b2..28de61268 100644 --- a/docker/apache-dev/debian-7/Dockerfile +++ b/docker/apache-dev/debian-7/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile index 4027f68d0..005acc5c9 100644 --- a/docker/apache-dev/debian-8/Dockerfile +++ b/docker/apache-dev/debian-8/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile index 1d2d95e8e..56d1d5fef 100644 --- a/docker/apache-dev/debian-9/Dockerfile +++ b/docker/apache-dev/debian-9/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile index 8edaed4d1..4c485c071 100644 --- a/docker/apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/apache-dev/ubuntu-12.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile index ea0a0d218..19e2565a8 100644 --- a/docker/apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/apache-dev/ubuntu-14.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile index 78bd50442..959496a17 100644 --- a/docker/apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/apache-dev/ubuntu-15.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile index faf7e2174..dbdc6d643 100644 --- a/docker/apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/apache-dev/ubuntu-15.10/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile index 2d6803247..67105047d 100644 --- a/docker/apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/apache-dev/ubuntu-16.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache-dev/ubuntu-16.10/Dockerfile b/docker/apache-dev/ubuntu-16.10/Dockerfile index 505605798..b09b4d889 100644 --- a/docker/apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/apache-dev/ubuntu-16.10/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/Dockerfile b/docker/apache/alpine/Dockerfile index 87257b1ab..11d956a08 100644 --- a/docker/apache/alpine/Dockerfile +++ b/docker/apache/alpine/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apk-install \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/alpine/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index f254aaf0b..9dca2bc0d 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -21,6 +21,6 @@ RUN /usr/local/bin/yum-install \ ' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index c3fab7340..0e7b45a39 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index dacb7b4f6..ed5c30c66 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index a4f9c31cd..5e22976b5 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -22,6 +22,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 7ca7ab25a..f48e73fc3 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index e890ba71b..240842b3a 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 3693a147d..422a632be 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index b97ed8fd5..d2b6478f7 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 32db5e021..f23e859aa 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/apache/ubuntu-16.10/Dockerfile b/docker/apache/ubuntu-16.10/Dockerfile index 90915db34..c94a90d76 100644 --- a/docker/apache/ubuntu-16.10/Dockerfile +++ b/docker/apache/ubuntu-16.10/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/base-app/alpine/Dockerfile b/docker/base-app/alpine/Dockerfile index e8b7229c3..3339af9e4 100644 --- a/docker/base-app/alpine/Dockerfile +++ b/docker/base-app/alpine/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install-edge shadow \ && /usr/local/bin/apk-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,8 +27,6 @@ RUN /usr/local/bin/apk-install-edge shadow \ openssh-client \ rsync \ git \ - nano \ - vim \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index f86b04355..172d3d521 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/yum-install \ # Install tools - sudo \ zip \ unzip \ bzip2 \ @@ -29,9 +28,7 @@ RUN /usr/local/bin/yum-install \ rsync \ git \ pygpgme \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 6bea67ac2..7f5fc64f3 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,9 +27,7 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 3aaf12cc6..d3a23b603 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,9 +27,7 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index b2705c08c..048e2545b 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,9 +27,7 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index 7a7defdf5..e9bd39ac8 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 1ec898006..2b9a73338 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index 8a7c1f275..19e2be442 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index 0c62b0450..eccf6b3b7 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 8a75d0673..dda43786c 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base-app/ubuntu-16.10/Dockerfile b/docker/base-app/ubuntu-16.10/Dockerfile index 8e2ebb131..b729fda59 100644 --- a/docker/base-app/ubuntu-16.10/Dockerfile +++ b/docker/base-app/ubuntu-16.10/Dockerfile @@ -16,7 +16,6 @@ COPY conf/ /opt/docker/ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -28,10 +27,8 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/base/alpine/Dockerfile b/docker/base/alpine/Dockerfile index e73ad3270..da3859e1b 100644 --- a/docker/base/alpine/Dockerfile +++ b/docker/base/alpine/Dockerfile @@ -31,13 +31,12 @@ RUN /usr/local/bin/apk-install \ && chmod 750 /usr/bin/ansible* \ # Cleanup && apk del python-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ - syslog-ng \ wget \ curl \ sed \ @@ -45,7 +44,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/alpine/conf/bin/bootstrap.sh b/docker/base/alpine/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/alpine/conf/bin/bootstrap.sh +++ b/docker/base/alpine/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/alpine/conf/bin/config.sh b/docker/base/alpine/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/alpine/conf/bin/config.sh +++ b/docker/base/alpine/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/alpine/conf/bin/entrypoint.d/cli.sh b/docker/base/alpine/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/alpine/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/alpine/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/alpine/conf/bin/entrypoint.d/noop.sh b/docker/base/alpine/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/alpine/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/alpine/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh b/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/alpine/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/alpine/conf/bin/entrypoint.sh b/docker/base/alpine/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/alpine/conf/bin/entrypoint.sh +++ b/docker/base/alpine/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/alpine/conf/bin/provision.sh b/docker/base/alpine/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/alpine/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/alpine/conf/bin/logwatch.sh b/docker/base/alpine/conf/bin/usr-bin/docker-provision similarity index 68% rename from docker/base/alpine/conf/bin/logwatch.sh rename to docker/base/alpine/conf/bin/usr-bin/docker-provision index 1a5b486c7..4ee715c64 100644 --- a/docker/base/alpine/conf/bin/logwatch.sh +++ b/docker/base/alpine/conf/bin/usr-bin/docker-provision @@ -5,10 +5,5 @@ set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/alpine/conf/bin/usr-bin/docker-service-disable b/docker/base/alpine/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/alpine/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/alpine/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/alpine/conf/bin/usr-bin/docker-service-enable b/docker/base/alpine/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/alpine/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/alpine/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-7/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/alpine/conf/etc/supervisor.d/syslog.conf similarity index 93% rename from docker/base/debian-7/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/alpine/conf/etc/supervisor.d/syslog.conf index 247fd1a25..20d1e238c 100644 --- a/docker/base/debian-7/conf/etc/supervisor.d/syslog-ng.conf +++ b/docker/base/alpine/conf/etc/supervisor.d/syslog.conf @@ -5,7 +5,7 @@ priority=10 [program:syslogd] command = /opt/docker/bin/service.d/syslog-ng.sh process_name=%(program_name)s -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/alpine/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/alpine/conf/provision/service.d/cron.sh b/docker/base/alpine/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/alpine/conf/provision/service.d/cron.sh +++ b/docker/base/alpine/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/alpine/conf/provision/service.d/dnsmasq.sh b/docker/base/alpine/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/alpine/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/alpine/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/alpine/conf/provision/service.d/postfix.sh b/docker/base/alpine/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/alpine/conf/provision/service.d/postfix.sh +++ b/docker/base/alpine/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/alpine/conf/provision/service.d/ssh.sh b/docker/base/alpine/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/alpine/conf/provision/service.d/ssh.sh +++ b/docker/base/alpine/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/alpine/conf/provision/service.d/syslog.sh b/docker/base/alpine/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/alpine/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/alpine/conf/provision/variables-webdevops.yml b/docker/base/alpine/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/alpine/conf/provision/variables-webdevops.yml +++ b/docker/base/alpine/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/alpine/conf/provision/variables.yml b/docker/base/alpine/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/alpine/conf/provision/variables.yml +++ b/docker/base/alpine/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index 45c23338a..7a18b1693 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -31,13 +31,12 @@ RUN /usr/local/bin/yum-install \ && chmod 750 /usr/bin/ansible* \ # Cleanup && yum erase -y python-devel \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ supervisor \ - syslog-ng \ wget \ curl \ net-tools \ @@ -45,7 +44,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/centos-7/conf/bin/bootstrap.sh b/docker/base/centos-7/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/centos-7/conf/bin/bootstrap.sh +++ b/docker/base/centos-7/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/centos-7/conf/bin/config.sh b/docker/base/centos-7/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/centos-7/conf/bin/config.sh +++ b/docker/base/centos-7/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/cli.sh b/docker/base/centos-7/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh b/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh b/docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/centos-7/conf/bin/entrypoint.sh +++ b/docker/base/centos-7/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/centos-7/conf/bin/provision.sh b/docker/base/centos-7/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/centos-7/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/centos-7/conf/bin/logwatch.sh b/docker/base/centos-7/conf/bin/usr-bin/docker-provision similarity index 68% rename from docker/base/centos-7/conf/bin/logwatch.sh rename to docker/base/centos-7/conf/bin/usr-bin/docker-provision index 1a5b486c7..4ee715c64 100644 --- a/docker/base/centos-7/conf/bin/logwatch.sh +++ b/docker/base/centos-7/conf/bin/usr-bin/docker-provision @@ -5,10 +5,5 @@ set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable b/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/centos-7/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable b/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/centos-7/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-8/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/centos-7/conf/etc/supervisor.d/syslog.conf similarity index 93% rename from docker/base/debian-8/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/centos-7/conf/etc/supervisor.d/syslog.conf index 247fd1a25..20d1e238c 100644 --- a/docker/base/debian-8/conf/etc/supervisor.d/syslog-ng.conf +++ b/docker/base/centos-7/conf/etc/supervisor.d/syslog.conf @@ -5,7 +5,7 @@ priority=10 [program:syslogd] command = /opt/docker/bin/service.d/syslog-ng.sh process_name=%(program_name)s -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/centos-7/conf/provision/service.d/cron.sh b/docker/base/centos-7/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/centos-7/conf/provision/service.d/cron.sh +++ b/docker/base/centos-7/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/centos-7/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/centos-7/conf/provision/service.d/postfix.sh b/docker/base/centos-7/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/centos-7/conf/provision/service.d/postfix.sh +++ b/docker/base/centos-7/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/centos-7/conf/provision/service.d/ssh.sh b/docker/base/centos-7/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/centos-7/conf/provision/service.d/ssh.sh +++ b/docker/base/centos-7/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/centos-7/conf/provision/service.d/syslog.sh b/docker/base/centos-7/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/centos-7/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/centos-7/conf/provision/variables-webdevops.yml b/docker/base/centos-7/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/centos-7/conf/provision/variables-webdevops.yml +++ b/docker/base/centos-7/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/centos-7/conf/provision/variables.yml b/docker/base/centos-7/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/centos-7/conf/provision/variables.yml +++ b/docker/base/centos-7/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 89ff6e935..6da91faa9 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -33,14 +33,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -48,7 +46,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-7/conf/bin/bootstrap.sh b/docker/base/debian-7/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/debian-7/conf/bin/bootstrap.sh +++ b/docker/base/debian-7/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/debian-7/conf/bin/config.sh b/docker/base/debian-7/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/debian-7/conf/bin/config.sh +++ b/docker/base/debian-7/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/debian-7/conf/bin/entrypoint.sh +++ b/docker/base/debian-7/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/debian-7/conf/bin/provision.sh b/docker/base/debian-7/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/debian-7/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/debian-7/conf/bin/logwatch.sh b/docker/base/debian-7/conf/bin/usr-bin/docker-provision similarity index 68% rename from docker/base/debian-7/conf/bin/logwatch.sh rename to docker/base/debian-7/conf/bin/usr-bin/docker-provision index 1a5b486c7..4ee715c64 100644 --- a/docker/base/debian-7/conf/bin/logwatch.sh +++ b/docker/base/debian-7/conf/bin/usr-bin/docker-provision @@ -5,10 +5,5 @@ set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf similarity index 93% rename from docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/debian-7/conf/etc/supervisor.d/syslog.conf index 247fd1a25..20d1e238c 100644 --- a/docker/base/alpine/conf/etc/supervisor.d/syslog-ng.conf +++ b/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf @@ -5,7 +5,7 @@ priority=10 [program:syslogd] command = /opt/docker/bin/service.d/syslog-ng.sh process_name=%(program_name)s -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/debian-7/conf/provision/service.d/cron.sh b/docker/base/debian-7/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/debian-7/conf/provision/service.d/cron.sh +++ b/docker/base/debian-7/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-7/conf/provision/service.d/postfix.sh b/docker/base/debian-7/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/debian-7/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-7/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-7/conf/provision/service.d/ssh.sh b/docker/base/debian-7/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/debian-7/conf/provision/service.d/ssh.sh +++ b/docker/base/debian-7/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/debian-7/conf/provision/service.d/syslog.sh b/docker/base/debian-7/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/debian-7/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-7/conf/provision/variables-webdevops.yml b/docker/base/debian-7/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-7/conf/provision/variables-webdevops.yml +++ b/docker/base/debian-7/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-7/conf/provision/variables.yml b/docker/base/debian-7/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-7/conf/provision/variables.yml +++ b/docker/base/debian-7/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 0667935fb..cafd0431e 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -33,14 +33,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -48,7 +46,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-8/conf/bin/bootstrap.sh b/docker/base/debian-8/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/debian-8/conf/bin/bootstrap.sh +++ b/docker/base/debian-8/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/debian-8/conf/bin/config.sh b/docker/base/debian-8/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/debian-8/conf/bin/config.sh +++ b/docker/base/debian-8/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/debian-8/conf/bin/entrypoint.sh +++ b/docker/base/debian-8/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/debian-8/conf/bin/provision.sh b/docker/base/debian-8/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/debian-8/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/debian-8/conf/bin/logwatch.sh b/docker/base/debian-8/conf/bin/usr-bin/docker-provision similarity index 68% rename from docker/base/debian-8/conf/bin/logwatch.sh rename to docker/base/debian-8/conf/bin/usr-bin/docker-provision index 1a5b486c7..4ee715c64 100644 --- a/docker/base/debian-8/conf/bin/logwatch.sh +++ b/docker/base/debian-8/conf/bin/usr-bin/docker-provision @@ -5,10 +5,5 @@ set -o errtrace # trace ERR through 'time command' and other functions set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errexit ## set -e : exit the script if any statement returns a non-true return value -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/centos-7/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf similarity index 93% rename from docker/base/centos-7/conf/etc/supervisor.d/syslog-ng.conf rename to docker/base/debian-8/conf/etc/supervisor.d/syslog.conf index 247fd1a25..20d1e238c 100644 --- a/docker/base/centos-7/conf/etc/supervisor.d/syslog-ng.conf +++ b/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf @@ -5,7 +5,7 @@ priority=10 [program:syslogd] command = /opt/docker/bin/service.d/syslog-ng.sh process_name=%(program_name)s -autostart = true +autostart = false autorestart = true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/debian-8/conf/provision/service.d/cron.sh b/docker/base/debian-8/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/debian-8/conf/provision/service.d/cron.sh +++ b/docker/base/debian-8/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-8/conf/provision/service.d/postfix.sh b/docker/base/debian-8/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/debian-8/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-8/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-8/conf/provision/service.d/ssh.sh b/docker/base/debian-8/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/debian-8/conf/provision/service.d/ssh.sh +++ b/docker/base/debian-8/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/debian-8/conf/provision/service.d/syslog.sh b/docker/base/debian-8/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/debian-8/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-8/conf/provision/variables-webdevops.yml b/docker/base/debian-8/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-8/conf/provision/variables-webdevops.yml +++ b/docker/base/debian-8/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-8/conf/provision/variables.yml b/docker/base/debian-8/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-8/conf/provision/variables.yml +++ b/docker/base/debian-8/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 4b6fa28f3..fe3576750 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -33,14 +33,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -48,7 +46,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/debian-9/conf/bin/bootstrap.sh b/docker/base/debian-9/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/debian-9/conf/bin/bootstrap.sh +++ b/docker/base/debian-9/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/debian-9/conf/bin/config.sh b/docker/base/debian-9/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/debian-9/conf/bin/config.sh +++ b/docker/base/debian-9/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh b/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh b/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh b/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/debian-9/conf/bin/entrypoint.sh +++ b/docker/base/debian-9/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/debian-9/conf/bin/logwatch.sh b/docker/base/debian-9/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/debian-9/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/debian-9/conf/bin/provision.sh b/docker/base/debian-9/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/debian-9/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-provision b/docker/base/debian-9/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/debian-9/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable b/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/debian-9/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/debian-9/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/debian-9/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf b/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/debian-9/conf/provision/service.d/cron.sh b/docker/base/debian-9/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/debian-9/conf/provision/service.d/cron.sh +++ b/docker/base/debian-9/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-9/conf/provision/service.d/postfix.sh b/docker/base/debian-9/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/debian-9/conf/provision/service.d/postfix.sh +++ b/docker/base/debian-9/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/debian-9/conf/provision/service.d/ssh.sh b/docker/base/debian-9/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/debian-9/conf/provision/service.d/ssh.sh +++ b/docker/base/debian-9/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/debian-9/conf/provision/service.d/syslog.sh b/docker/base/debian-9/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/debian-9/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/debian-9/conf/provision/variables-webdevops.yml b/docker/base/debian-9/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-9/conf/provision/variables-webdevops.yml +++ b/docker/base/debian-9/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/debian-9/conf/provision/variables.yml b/docker/base/debian-9/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/debian-9/conf/provision/variables.yml +++ b/docker/base/debian-9/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index 680bc24e0..4c51ff425 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-12.04/conf/bin/config.sh b/docker/base/ubuntu-12.04/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-12.04/conf/bin/config.sh +++ b/docker/base/ubuntu-12.04/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-12.04/conf/bin/logwatch.sh b/docker/base/ubuntu-12.04/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-12.04/conf/bin/provision.sh b/docker/base/ubuntu-12.04/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-12.04/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-12.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-12.04/conf/provision/variables.yml b/docker/base/ubuntu-12.04/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-12.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-12.04/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index 6c203b3e6..0c862bb5c 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-14.04/conf/bin/config.sh b/docker/base/ubuntu-14.04/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-14.04/conf/bin/config.sh +++ b/docker/base/ubuntu-14.04/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-14.04/conf/bin/logwatch.sh b/docker/base/ubuntu-14.04/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-14.04/conf/bin/provision.sh b/docker/base/ubuntu-14.04/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-14.04/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-14.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-14.04/conf/provision/variables.yml b/docker/base/ubuntu-14.04/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-14.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-14.04/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index acc84ff30..7c778f671 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-15.04/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-15.04/conf/bin/config.sh b/docker/base/ubuntu-15.04/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-15.04/conf/bin/config.sh +++ b/docker/base/ubuntu-15.04/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-15.04/conf/bin/logwatch.sh b/docker/base/ubuntu-15.04/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-15.04/conf/bin/provision.sh b/docker/base/ubuntu-15.04/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-15.04/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-15.04/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-15.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-15.04/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-15.04/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.04/conf/provision/variables.yml b/docker/base/ubuntu-15.04/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-15.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.04/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 42ec69c25..2a93d9829 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-15.10/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-15.10/conf/bin/config.sh b/docker/base/ubuntu-15.10/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-15.10/conf/bin/config.sh +++ b/docker/base/ubuntu-15.10/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-15.10/conf/bin/logwatch.sh b/docker/base/ubuntu-15.10/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-15.10/conf/bin/provision.sh b/docker/base/ubuntu-15.10/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-15.10/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-15.10/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-15.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-15.10/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-15.10/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-15.10/conf/provision/variables.yml b/docker/base/ubuntu-15.10/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-15.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-15.10/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index 51d964416..14468bc67 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-16.04/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-16.04/conf/bin/config.sh b/docker/base/ubuntu-16.04/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-16.04/conf/bin/config.sh +++ b/docker/base/ubuntu-16.04/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-16.04/conf/bin/logwatch.sh b/docker/base/ubuntu-16.04/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-16.04/conf/bin/provision.sh b/docker/base/ubuntu-16.04/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-16.04/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-16.04/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-16.04/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-16.04/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-16.04/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.04/conf/provision/variables.yml b/docker/base/ubuntu-16.04/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-16.04/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.04/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.10/Dockerfile b/docker/base/ubuntu-16.10/Dockerfile index 9721ee067..8fc61d908 100644 --- a/docker/base/ubuntu-16.10/Dockerfile +++ b/docker/base/ubuntu-16.10/Dockerfile @@ -32,14 +32,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -47,7 +45,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] CMD ["supervisord"] diff --git a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh b/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh +++ b/docker/base/ubuntu-16.10/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/base/ubuntu-16.10/conf/bin/config.sh b/docker/base/ubuntu-16.10/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/base/ubuntu-16.10/conf/bin/config.sh +++ b/docker/base/ubuntu-16.10/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh +++ b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh +++ b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/base/ubuntu-16.10/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh +++ b/docker/base/ubuntu-16.10/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/base/ubuntu-16.10/conf/bin/logwatch.sh b/docker/base/ubuntu-16.10/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/base/ubuntu-16.10/conf/bin/provision.sh b/docker/base/ubuntu-16.10/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/base/ubuntu-16.10/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable +++ b/docker/base/ubuntu-16.10/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog-ng.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/base/ubuntu-16.10/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh b/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/base/ubuntu-16.10/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml +++ b/docker/base/ubuntu-16.10/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/base/ubuntu-16.10/conf/provision/variables.yml b/docker/base/ubuntu-16.10/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/base/ubuntu-16.10/conf/provision/variables.yml +++ b/docker/base/ubuntu-16.10/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/bootstrap/alpine/Dockerfile b/docker/bootstrap/alpine/Dockerfile index a37ac69c0..88f161803 100644 --- a/docker/bootstrap/alpine/Dockerfile +++ b/docker/bootstrap/alpine/Dockerfile @@ -11,15 +11,13 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ # Add community && echo http://dl-4.alpinelinux.org/alpine/v3.5/community/ >> /etc/apk/repositories \ # System update @@ -51,4 +49,4 @@ RUN set -x \ && GOREPLACE_VERSION=0.5.4 \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/alpine/baselayout.tar b/docker/bootstrap/alpine/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index e879160da..353501e59 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -11,15 +11,13 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="en_US.utf8" \ + LC_ALL="en_US.utf8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ # System update && /usr/local/bin/yum-upgrade \ && /usr/local/bin/yum-install \ @@ -42,4 +40,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && yum erase -y wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/centos-7/Dockerfile.jinja2 b/docker/bootstrap/centos-7/Dockerfile.jinja2 index d248f9571..e75d76b54 100644 --- a/docker/bootstrap/centos-7/Dockerfile.jinja2 +++ b/docker/bootstrap/centos-7/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.general() }} +{{ environment.general(charset='en_US.utf8') }} {{ docker.add('baselayout.tar', '/') }} diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 zcmV;7BXitBT4*^jL0KkKS*nBfp8y_Cf3^L*0APRr|NsC0|NsC0|No!?1ONa60RRLD zU@PAEJ_p|S&zq*)PpGH27_9Cu|Zef;1nGUG9sH08Z?1D zLrqPhYJQ~JY95K{q74{;F$Rp9KUC0Y0MkLBOn^kwNuY>W@$ZMw&fCKs_}w8UO}>28MtHr=*BNVrZw7^vIpY)Owl#9-spt2jn1s#qSp<>&xId z2qG(%xhOUf+zZKx0x5`qh)u!*^MVBV{hx2nO)Kr$h7^6ap4AjxWQOET5FoBCNJ2&h z{94Oqdo6|Xmn!*E1PvA}2*x5nHl$d{RH~wsAQUJ?0>mI7L5T}AF+zeMLV^ejxIqXo zgc!giBnc=*MMP*p8fvITR;f@{g{48Nq*0(~RcTSB5fl-jL_unr0R>fQM4%Rw1b!Ze zwC(#}zJFK0FZnj3=N6GhkD7|72|c*DQrS(>s#aW#VypbJ3R2TTg|!-5&nk^L!IhGX z7bA$XNuHhg{}k8ePqi%vU+}me5K9>K?u21gwslN3<;iDuW|nY@pEE5P0nq{ntq4Xv znP!SgE$g#wBE z)VAK&4YnPT&iEE8zfF&(HiNU3CrvxUOOq3?pBy!aVKLs}K;R|FNW?I$_wDT{zGUC> zej*2G5J$dS;@^p4{I zJEuv?p=@pg!?VNXhRvUD$o=8W{m*yOdE4f{?mLT3{lk}Z8f&F z!n|u-d8^M|_3s#yGSae;MN2X~SRWS6DLFCH=t_A?QjIb}CO(v^mg;)X5koEp$h7#E zhWsMDn_h_Fx$}ORZ;hqPHo4o3X_VS~*PCOX6HODUTW715I9GmDMhL=jwcd*Oys~_y z-6Or_ywpVJP5OJ(&GR+CWx7@KlO7b-`kg0y;W=6-j;1b%2Go_Zcscwr z6pB`IJ?jpVKKFfa_;u;lf{Zxc4&6H7_^o$j+s90{i+p<$Z7-E+^P?Jamz+GlOZhuO z2!i+xr9x)f<>+wND<@bxjg_$8Ah&+c6`fx*`1Sk(WJC~EP=x{}=$%#wSchD@WFB!L zKVga;I7D>$I~vXUw;}l87u*eaHtTG{hdIe-PC0}87Wd~g+|E|c=nmnUPA#8E^Gv9X zTo4VuJEQE5(NU2A`x*$e`BCMSNx58`FCV)NZ$~`8vkb-`g~RG-f(6{dE_L|vzIcS&Lk{jr~>Ah+(wn za*nAai%Kb6Qa2^DP51J&a6?6OMO6)$?IW}+!Qjz^>Q=q?f*5@+_kJKQ_P22PERti$ zvv3S`ZCuS2mSw(g#1PH;<;X(>eaN;5+QT8zoz!DBiG3asOfOFqe zTzNq|32%@J>yhwsgpiUFMI?lfk`h8lNeLk&B!rNX5<*X3XRlP&wb45z{yD=q_IP|) zJMv9EoOQ-kQ%M~2tVK+TiAFwA-r)N8W-S|;W@NQ=xu7_Ty75U+Un#aguA-CyU#MEs-|;yQg-oiVk6p`X^Yv3i60I9 zZVVo(4b2yLyki{U>9|Q0k_f4~V^FWSg=Z2>UzfrY+I1OTLy6Jnf5fq}<5K7gDW5e= zlQ2fKhjGU_q7IZpZh{RYRXk)=Yvqu{k7pCho^!`d3?D9HyyVTvQXE&~d(k@tf&nel z&=d+4!=m*Hs*STtx9Y0U?i!qWx{od~PEr>ly}dbg$i1tkiQgf*L~7(SGdInE&7I6e z)k#%Ul{Emns5?)7-=o!WAYjL)lK^^cs+35mt&%%bAj)!vFAi)oQj)5a6)XUb5u!FW z;GqbsA}92W({0$k{aaAf8LYT+JLx_9zp_xroFQd z%$`O%Q37|>TH-xVCDQ$KUb*$}erznAxIc>)pM}%{z$>BO+XK71;l>Z5N4v7^ zcY#s}uM*Fk3g^qsocHaruU%9+?@KQ9sk8?+XNLZR z@AKku?&V>3cCNmPyF|*XT{CBM9F82%QLS1d66IiJ_McU@fDV+slX3z*S^Je$&yug3 z&%2Ito)f<2x^C?JTZ;Q1FjmLOx)OR-_XEER$U+hIt-fc5AmfGy&5ZTEBH5)F@$PJv_Kh3 z(Fh7>7%*ahP*FX#Kz&qt>c6_~?jsSROON*^>evGKJ?}ia?UNA245g7skK*ycqZotZS#ND4hsoaL=M~;Kx1NxC>GkR%6Fn0DK zfHkP6iW$(5yDB0-oh;$Y^su+6kUxO$t05YYf#UVTjvus0S`$O~{3B11 zZXT8bU{PmK%a>HcDjAx$FJr3G+ibzjt$YH|Hx#NRcUM%z2y$0=n8vu93t!g-ZTyp` zS*J4`H2fIc76EXsu?iJ{;_Zp04L-UKRzo&yLlZ0ozdjiKPfgbU*LESaEdPEkrGyiFsmC~WoCE&8FcBrJcG z*ti{J?tLAfc@;Y|S1)hvS2XMRD2x&8v84F4are>ltgmUZRZaOTO89E-j5nsT$1MiB zM4G8YkZCC3YA}*yX(mzCv3a!TrYYaECUj@3@SiMik3j^PmX(x(Dqu8i-JXEKqkTlk z4d_Qa6zUD`u$}}Ykg06rKQlpSvpyO(Z|!H^n~ionw$fZLYgbst6G`x`_TXuh?w<^IbH26Xy%B;m(#`(hspVfOZs!Sc72M?N6)J z;o*~OAhu`4ZWBjhVeam;NvzpOaHbefK*XVt@o{LNrN>>09obklz$VKX6%(0+6CrP=Y>dpuW+z=fp=X9zYTD*+X9HGvsGz`$G|t}(HIG4Ne_N`>y^L&b20QXx zDqtv?S8D^2>YIoF7;p;tqU<#w2BZK|yGcoDpDaUU0i^O`XH!cG50PXu?%k#J0@_++ zfkk0i{iBMF~QR@dbuZ07-xe+W;ugD;oyYn%n>sC%gHR(vQ;*-9=0t zj&BuS;a_6Uhs5OJ@!D&LS$ky+*O${JaQZ5o2j_?#7(%X}%d7)hS%Rz+{kmB7ysKOW zOSiJlzAkW_R_&>$$9+GW_l+c?kNQf9Q6msD*#ngx)2kq=imOtJkyZHe`F#6TW{T$h z-d}k1d|uC1;*DGcdX3s7-J8WYeF)L0g5Jg4M_JK6N{NZ6>_wN3GY>w$UY1}iYY1uU zXW2iph+eCHSHP1qB&6>MTof{(2xZT>eKnE7Ax@UHM1wOVr0)n;P|AQIjr_m^f%+g| zgbEgR%%9oMjs^x0w^J8w$KL?J`}~S(zC)oDgaZH**kXRmmlJA1I;dfZ?m9GJFYQ7A zagI<^Ac0WNr2}+7c?<2t?yGj}t6_PCukAEfH>OrVEOR-83QeoMY3*iAe!#jiMtlZx zSfwW^Nb0C{9hODnuCEoXWXC}?WJr=3guTqwT9llnBdVd)UdXxv=|`FzDB>I-9bs!b zEH2I}@#J5UkDC3c;@be<`}P;8^-_vC6WMo z@Z&HOCWxYrg?OjIfp_tR&L;fayc~x?bkb$zD^i6fi^gjPFoSu@ag7>uY2MU5N-7#^ z{OP8dbjarH%&cZ>N0|%pK!&Jr_KGNZ4#553Jb=^#jx`0g9TGKj@hT{as99VM7&;w(uUH)HwU`m>k}y;clTMuZXCIIZrf+NbM|>1x02cCo%Tna zXw{Hjs?Igoh>cNbC3~o`fqYyp49#ab+D|?EvA-p!5yd@En;E08iPjq%9lL-snF&zZ zSyXmxKW}|qyKJg;q(K!X`#ALM&NNjj6%s~C3dY2;Nm~QOL%W@WDE3D-mW84Q(1UOR zAvB4*(%@is%lFC%5TlPxIB1$UN9PLNC?Xncgf_itCz>&=<`t_7)k6EG`Gz&9F-q95 ztvV>oFfb4o%3{(s*9w4lBzVNObYsiZr|Q|qeC1%Pcva=YS7}zpI9Mv!)#cI?V4aTo z3~P;qHuu2<4%D$kuCyyn{n9LxB^$iv--qN$*Uur0WRp3~aH7MJjYRe4+0!8r)!o;4 zv5`bXH0BW~ z7YT=6uk&>BxH}FvxzpLj&^~bG495Za2Ru5&hS8`!qy8ijH`XM(Gcze9l2bD>mna~( zHijb*UNh6bH*V>dd6|-`=!k+MA|t5OABkVH!UT~lqmIg}1MJ)3dnPQ6%fEFUI4Y~i zQAZ)Tq&XD=@zb-GF^pniO?q?Jbwou~B$ZWFQmTroLP;HapO+>(TCDc9twse^{EDip zkmbGl_(tW(OS={}+w3{({$BO+l4BPpFA_{+aB>5zJM}&2LQ4(-+Hnp6uH{u#+j^?& zw>=-oo4Rd&ZE?$S!0L9s4zqUywPMW;Y6^=S)!5AkGc%B2Jwc*|PyNXl&5@ZbFdiKj zvPGT6mKhF(L&~f$FNcjZlFxR}vVo z{N2CAt_Waun1{Z8P2s%sBv9@{^mrCK#QFD@cTElL&fk9yx*0SD?pzSV`Q@?l#*t36TO=V4P%o-RNng#4V(>MVJXMC$WqijqN++GIc ze146qfq&e3jLM1mONH&$-a!Mk1E*s16JVfWW4Sm?u=sh>`i6k}_UF|dm|`A=yv#XX@G`;LA=rhZx)ea85Op?ybEGnc+@?ie7sy@CpKjI} znP71Dm*;PF!_hn4whwv4^a~(SvrcEQckRGV>F)@Rni_?7KmmxT0>JY3?F-N*kdag) za40Y44|h-txCeE)0)oWp;G^;T1DT+wNapl#6cza0*^(QBxW6MySck&z4SOJSp-$C> zIh1tgSpoPEx2~ElJ#~a3LPm%W_!%Ld=G?k?h0HF94W9rSn4T* zl#pQ&10m8SKnh6o1ndQ@5-qL52D_L?FrdIN#{#mL1xECcr(z62O z7TK~^*~%7&1adP!zXeOPd!S$vtqzc-aKRIU+jEm=A)|LJ8mYFK&BCiDs6>sa>3OZ{ ztYwA;ijFX|*yU}Qkenk)1isqS8&k9%BM%5jJWYXy`7Q>9ji&>J_NL_uDIO0BAJ+!L z+=~ADKc#la3JYGQbKre&`rhXgUP($$XD$4%e})p-Lnk0_d*bJrZY#(!MFsKo*e}^9 zpmZIGK@?k_z~KUb^YrfL0JymwpDy;R^X0EqaeMJn<{1N{6yMK4Iz#7s*LAOJmVqI@ z&2R(@B|<&gl#2)$`JYGa4W{rrTov%zIBW0-hS<5Gxb@|-(}>iyiQ`BWFggW_cE^d( zO!EY?;{ebTC3z8Y0_L^P&t7t@au3E;IiVoXWXlCwaXR(Jb(1P#(n5?3Oav+ytw9sO zJ-kiizsB7(+;JDLB@o}leIZkvz?j@J3bAKV+AcMkN^f9Mv>YzrDJp_EIfCF`j%ZqJ zv>knoT0m)IPQviwZUZ^H9D6LYfZ3A40L=vnPR=wOn+o^-lfm$>i z4!H0Pj1hJ0IC30sfEQp)PAVX{)QTQft6ZSz@C*Xya6_~_!%^HD(u2p2!vM4d>9y$&zivuVpfJaac#pz{Zo13gv@q$+}1EkKZwoPN;@1RRg3 zGjjVe>fO<_2&dTu3TzO@G_8cjEU-2`)5>v}IOb2?nSlZDJdB5#mODhK**u^y5y8KPVQCgb^93F;X8_nL=b z)@FJR!WjW?gb#<)5~ir#gSjxt*a|vG8%Eaio(Ja`6kr=;hiIJWn6j9j#5u2B^-@6k zn1$e=Pk!RO*L{IF0BUy6yTGI_8|s1%kRj;w5G&YkIPWxGz@f7G1}Sf)$9gbeR0$U2 zV{=Nf&LKbsaw^agC8}r-3d-edM^Z9K10x_vDI&&dA?t-eKCyre1R1Syw#YFfm;g-9 z{loQw#^{;)xe3MshCwq(dEj+eKuYshVh2}B31V15gi;bwzRi#< zDX1Nx+&4J|gJFR3))HnNftpYrn|_Vy?gGsm3J%nE2Y@qJv=%8#RRno2)VxL0LmZJo zco#n4o)*CX!6b+TB!tMo53MuW%V+R8WVbtg_0QWWH+LrRcU<;P4%`LGE4B|xv167& zk_UaaTof0KaE88mK+y5%OG?3B zkprws{9}MX3_gh`feqk=U_d+JAnw>wK>VSAT)Oj!z47iog@NOh)0)wl2B5VYL9~sD zV*r}n2^l1Ph0gZ@#kaTbjUQZ12S6DRCvapQrBh&qdXR1I)5g^!_H^oIxwp8|)# zA@|m7Vd(%aeqX>~9>6p@axQa)4FG-KRJ2&Eur_D~!)F7$q2nL0vrnLR5OZJA%s}Vj z5a%ot>ljk-`n|XYYmr>GxlB97@M>(ToqW_`$nR@29&o8=<>BM>TQc?WmX@KT0Gcbb zP$eaZ?{CS>ba4nyVbPoulxtlGRGc*8!iV0FH>Yo(5&1s9BqjfJDjkm5@+T-l7cxUf zU~NJ?hgTsC0X*K~3Rox%cgM7jMb})&>Si1NAy47yJ81K{qUwg)HUQB;233HV96&li z0?&q(3pKA1*lV`(gHtW25Wt2ym{m6U{wyypWeBu1ykkMzyF#v2@&eTWprB5mo821` zDFRFY#>w;)f(D@t5ku95RaN)`{q4Bj-Pj@y0|zKgN(+!EGAIK;fy|^#Pq_%kPloy~ zJ%?Hn!Td(82{7@mzmu7tlLwbrj^Udw(O;gb?fm?1&$z0xuq1vVtuXU3QE_o zE1~l=51+CQcoWpuNeqGe;8=-EFb$CnktfqbM3P8H>%@emsGDMZv#SrMc3|C{bG025 zT~5k}286C!D43b16DA092c)cES41S070fuLp0gG#<@8yH)b^qA?+oA&Gg4J1MJZvD z-Bh)bNVh(&bQ`3(v@}zPLlEr<9z++oG$>QM<0G^z9f1P^0B|4&e+fFD*DfAUQQjNM zSKE<_8)yf790P;c(Y+`_xkAUv;TvvCy1O$)U8W;hZzb7;0%BhRkB1;_oyIRLKI?oS-xblu??^nrufML);;=zC$nzCLUG|mh6s}r|UShbU-)xOwsEa6a^># z$jLtLAV=@E(4N0|K-s_^fb;Y`JPU&&gWMRtABDy8Lt&rr)|)x8AzucY#Lp4X3UHbd zq~o3V0|77;fW!k|XNxeBxSQXOB8sPMkj2n>^NR79vqIEXqeRl{LXmK*HtIsqsA>#E z#<125N5C;mf)8+4X4SX}cmZ%-=?IUqzzr>=iNYq>5CMiI)0Q~V*ncUIIT+|u|JYpn z&Be74K!LR2V~v8O7VGrHM}XgjzILEa6b||<{KjqPvd3@ISPds#ID?^nw8GRakw4G+#OR$ z)?2fqTR>YjE^5^WOha)>H?GmYBXB-vcZgn*jHTdp17N-e$Ut$0W<#ju+FR>$j2s~9 z3+*%m?F9wu8LQ#y1%tPjqlkJ7p{$BvP;3Jw#WMi(NKiXNe^$)!Fi9Z@kcNfqW<$g} z9jZM6OD~tF)?^OK;bXhpiQ0ep16QAC1`vugXrO@w?ra*4eK&08J)yijP36a@Pq;RN zL82S%520KdkD3y&Fw?WUt?WxP4#u1S9oKfd%Aox>DGQDvLXC_%goHf2Z)Lexmhk7#*he_JI^x4 zE4|t>JtC diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index 8890ead14..f02be8fa4 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -11,19 +11,17 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -32,9 +30,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -52,4 +47,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index f769aa8b1..cea111f90 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -11,19 +11,17 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -32,9 +30,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -52,4 +47,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 81492d33d..a8d40bb46 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -11,19 +11,17 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -32,9 +30,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -52,4 +47,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index b0f296459..53658d63c 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -11,8 +11,8 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / @@ -24,10 +24,6 @@ RUN set -x \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -54,4 +50,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 3634806fa..c97143d20 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -11,18 +11,14 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -49,4 +45,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 27bdd36ef..9ef86f61f 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -11,18 +11,14 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -49,4 +45,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index bad1f136f..815746055 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -11,18 +11,14 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -49,4 +45,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index 803a33461..ac3194605 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -11,18 +11,14 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -49,4 +45,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/bootstrap/ubuntu-16.10/Dockerfile b/docker/bootstrap/ubuntu-16.10/Dockerfile index 51cb2d5f5..0707eff74 100644 --- a/docker/bootstrap/ubuntu-16.10/Dockerfile +++ b/docker/bootstrap/ubuntu-16.10/Dockerfile @@ -11,18 +11,14 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -49,4 +45,4 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/bootstrap/ubuntu-16.10/baselayout.tar b/docker/bootstrap/ubuntu-16.10/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/certbot/latest/Dockerfile b/docker/certbot/latest/Dockerfile index 812673a5a..912fa7ffa 100644 --- a/docker/certbot/latest/Dockerfile +++ b/docker/certbot/latest/Dockerfile @@ -17,4 +17,4 @@ RUN /usr/local/bin/apk-install \ && pip install --upgrade pip \ && hash -r \ && pip install pyRFC3339 configobj ConfigArgParse \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile b/docker/dockerfile-build-env/latest/Dockerfile new file mode 100644 index 000000000..24d421982 --- /dev/null +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -0,0 +1,47 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/dockerfile-build-env:latest +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/bootstrap:ubuntu-16.04 + +RUN apt-install \ + build-essential \ + python \ + python-dev \ + python-setuptools \ + python-pip \ + ruby \ + ruby-dev \ + ruby-bundler \ + && pip install --upgrade pip \ + && pip install --upgrade setuptools \ + && pip install --upgrade \ + MarkupSafe \ + Jinja2 \ + graphviz \ + funcsigs \ + pbr \ + six \ + mock \ + psutil \ + pylev \ + py \ + appdirs \ + pyparsing \ + packaging \ + pytest \ + simplejson \ + backpack \ + cleo \ + pyyaml \ + yamlordereddictloader \ + testinfra \ + cloudpickle \ + pyinotify \ + configparser \ + doit==0.29.0 \ + termcolor \ + pytest-timeout \ + pytest-rerunfailures \ + && docker-image-cleanup diff --git a/docker/dockerfile-build-env/latest/Dockerfile.jinja2 b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 new file mode 100644 index 000000000..2c3c22854 --- /dev/null +++ b/docker/dockerfile-build-env/latest/Dockerfile.jinja2 @@ -0,0 +1,42 @@ +{{ docker.from("bootstrap","ubuntu-16.04") }} + +RUN apt-install \ + build-essential \ + python \ + python-dev \ + python-setuptools \ + python-pip \ + ruby \ + ruby-dev \ + ruby-bundler \ + && pip install --upgrade pip \ + && pip install --upgrade setuptools \ + && pip install --upgrade \ + MarkupSafe \ + Jinja2 \ + graphviz \ + funcsigs \ + pbr \ + six \ + mock \ + psutil \ + pylev \ + py \ + appdirs \ + pyparsing \ + packaging \ + pytest \ + simplejson \ + backpack \ + cleo \ + pyyaml \ + yamlordereddictloader \ + testinfra \ + cloudpickle \ + pyinotify \ + configparser \ + doit==0.29.0 \ + termcolor \ + pytest-timeout \ + pytest-rerunfailures \ + {{ docker.cleanup() }} diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 26c575a99..95830dfb6 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -26,6 +26,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-hhvm-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/hhvm-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index df73bbc6e..e7698806d 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-hhvm-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/hhvm-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index 69f10e4aa..776e7f54a 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 7d089d22b..d2a962541 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-hhvm-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index 08c86e08f..49f68ffcb 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -14,7 +14,7 @@ COPY conf/ /opt/docker/ # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ + && echo "deb http://dl.hhvm.com/ubuntu $(docker-image-info dist-codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ @@ -24,7 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index 7f070fc71..d755bba4f 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -21,7 +21,7 @@ RUN /usr/local/bin/apt-install \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-hhvm \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/liquidsoap/latest/Dockerfile b/docker/liquidsoap/latest/Dockerfile index 1f5fea890..5293bf019 100644 --- a/docker/liquidsoap/latest/Dockerfile +++ b/docker/liquidsoap/latest/Dockerfile @@ -12,7 +12,7 @@ RUN /usr/local/bin/apt-install \ mplayer \ gstreamer0.10-plugins-base \ gstreamer0.10-plugins-good \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ENV LIQUIDSOAP_USER "liquidsoap" ENV LIQUIDSOAP_TELNET "1" diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index 4f218b4e4..51c61f04b 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -19,7 +19,7 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/provision add --tag entrypoint webdevops-mail-sandbox \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-mail-sandbox \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install Roundcube + plugins RUN cd /app \ @@ -31,6 +31,6 @@ RUN cd /app \ && rm -rf .git installer \ && ln -s /opt/docker/etc/roundcube/plugins/webdevops_autologin/ plugins/webdevops_autologin \ && ln -s /opt/docker/etc/roundcube/config.php config/config.inc.php \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 25 465 587 143 993 diff --git a/docker/nginx-dev/alpine/Dockerfile b/docker/nginx-dev/alpine/Dockerfile index 81cbdbb6d..41ff22fb1 100644 --- a/docker/nginx-dev/alpine/Dockerfile +++ b/docker/nginx-dev/alpine/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile index 3d1cdb799..39e9578cc 100644 --- a/docker/nginx-dev/centos-7/Dockerfile +++ b/docker/nginx-dev/centos-7/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile index 83011f369..06c1bb79e 100644 --- a/docker/nginx-dev/debian-7/Dockerfile +++ b/docker/nginx-dev/debian-7/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile index d929d08a7..3d9d515d1 100644 --- a/docker/nginx-dev/debian-8/Dockerfile +++ b/docker/nginx-dev/debian-8/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile index 82719d364..7f9707c14 100644 --- a/docker/nginx-dev/debian-9/Dockerfile +++ b/docker/nginx-dev/debian-9/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile index 058cb4406..5c5d9642f 100644 --- a/docker/nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile index 8e1398af6..10fd4f261 100644 --- a/docker/nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile index 52df57365..c2ff87c60 100644 --- a/docker/nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile index e7a759387..1783b1be2 100644 --- a/docker/nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile index cffce7d12..52aa24a19 100644 --- a/docker/nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx-dev/ubuntu-16.10/Dockerfile b/docker/nginx-dev/ubuntu-16.10/Dockerfile index 42d527956..effd29520 100644 --- a/docker/nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/nginx-dev/ubuntu-16.10/Dockerfile @@ -15,6 +15,6 @@ COPY conf/ /opt/docker/ RUN echo \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/alpine/Dockerfile b/docker/nginx/alpine/Dockerfile index 6e53db2b1..ef989626e 100644 --- a/docker/nginx/alpine/Dockerfile +++ b/docker/nginx/alpine/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 75f4220b4..d7ea36389 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index 668f78582..0b5f9b368 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index a56051125..cfa899058 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 311f8ebc4..802424c03 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index b18c6891d..5a0ea993a 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index 8aabcd1ac..9515f45b8 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index a82387df2..88e3e8615 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 7b13c8bd2..4ca4bb0d1 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index 13537074b..9b1cc784c 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/nginx/ubuntu-16.10/Dockerfile b/docker/nginx/ubuntu-16.10/Dockerfile index 4a0494b9e..11e773c2b 100644 --- a/docker/nginx/ubuntu-16.10/Dockerfile +++ b/docker/nginx/ubuntu-16.10/Dockerfile @@ -16,6 +16,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile index e50479a3f..453876d7e 100644 --- a/docker/php-apache-dev/5.6/Dockerfile +++ b/docker/php-apache-dev/5.6/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile index 953262147..1820cbc4f 100644 --- a/docker/php-apache-dev/7.0/Dockerfile +++ b/docker/php-apache-dev/7.0/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/7.1/Dockerfile b/docker/php-apache-dev/7.1/Dockerfile index e3e780c2f..35c77e557 100644 --- a/docker/php-apache-dev/7.1/Dockerfile +++ b/docker/php-apache-dev/7.1/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/alpine-php5/Dockerfile b/docker/php-apache-dev/alpine-php5/Dockerfile index 77cae4762..6c27a1db3 100644 --- a/docker/php-apache-dev/alpine-php5/Dockerfile +++ b/docker/php-apache-dev/alpine-php5/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apk-install \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/alpine-php7/Dockerfile b/docker/php-apache-dev/alpine-php7/Dockerfile index cdbcb36f4..fb25a1d2a 100644 --- a/docker/php-apache-dev/alpine-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-php7/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apk-install \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile index cdf335f5d..e7cef5948 100644 --- a/docker/php-apache-dev/centos-7-php56/Dockerfile +++ b/docker/php-apache-dev/centos-7-php56/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/yum-install \ ' /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 --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 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 index 4df3436ce..c285be286 100644 --- 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 @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: 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 index dce03a1cc..faf05f8de 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7-php7/Dockerfile b/docker/php-apache-dev/centos-7-php7/Dockerfile index eb6143dea..6f50a8280 100644 --- a/docker/php-apache-dev/centos-7-php7/Dockerfile +++ b/docker/php-apache-dev/centos-7-php7/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/yum-install \ ' /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 --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 1049fdce7..643fe49df 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/yum-install \ ' /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 --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 025b220b2..cbddbeed1 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -26,6 +26,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index 74c5088d0..d478479f7 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index 349c1ca49..ca840eebf 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index f5c138ec6..91a1576e5 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index f4901d6db..86b76734f 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -27,6 +27,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index d4f17e4f0..17f78ba49 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -27,6 +27,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 410e6b665..0cb2b1143 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index df5988603..78402f298 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index b6ff2581d..f98737eb8 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache-dev/ubuntu-16.10/Dockerfile b/docker/php-apache-dev/ubuntu-16.10/Dockerfile index 09e3beaf7..27e65e220 100644 --- a/docker/php-apache-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.10/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-apache-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-apache/5.6/Dockerfile b/docker/php-apache/5.6/Dockerfile index 23026fe67..2e5dcff58 100644 --- a/docker/php-apache/5.6/Dockerfile +++ b/docker/php-apache/5.6/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/5.6/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/7.0/Dockerfile b/docker/php-apache/7.0/Dockerfile index 4ab862e0b..a39c8bd81 100644 --- a/docker/php-apache/7.0/Dockerfile +++ b/docker/php-apache/7.0/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/7.0/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/7.1/Dockerfile b/docker/php-apache/7.1/Dockerfile index 1048079c5..c5c2449bd 100644 --- a/docker/php-apache/7.1/Dockerfile +++ b/docker/php-apache/7.1/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/7.1/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/alpine-php5/Dockerfile b/docker/php-apache/alpine-php5/Dockerfile index 4c3756675..6d18e6a6f 100644 --- a/docker/php-apache/alpine-php5/Dockerfile +++ b/docker/php-apache/alpine-php5/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apk-install \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-php5/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/alpine-php7/Dockerfile b/docker/php-apache/alpine-php7/Dockerfile index c2f4c9f5a..e355525c4 100644 --- a/docker/php-apache/alpine-php7/Dockerfile +++ b/docker/php-apache/alpine-php7/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apk-install \ ' /etc/apache2/httpd.conf \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/alpine-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile index bd8b9e4d5..bc6ccafd5 100644 --- a/docker/php-apache/centos-7-php56/Dockerfile +++ b/docker/php-apache/centos-7-php56/Dockerfile @@ -22,6 +22,6 @@ RUN /usr/local/bin/yum-install \ ' /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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 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 index 4df3436ce..c285be286 100644 --- 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 @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7-php7/Dockerfile b/docker/php-apache/centos-7-php7/Dockerfile index 2854a749e..a04c97e43 100644 --- a/docker/php-apache/centos-7-php7/Dockerfile +++ b/docker/php-apache/centos-7-php7/Dockerfile @@ -22,6 +22,6 @@ RUN /usr/local/bin/yum-install \ ' /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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 178a7e028..049b849ff 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -22,6 +22,6 @@ RUN /usr/local/bin/yum-install \ ' /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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index c0962ce69..6144ad347 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -25,6 +25,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions fastcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index 25d870c80..b109d736b 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8-php7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index fec243523..d3a2e8d4d 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 6e2579477..7ae952ed8 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 092ccd4d9..f647ae3c8 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -26,6 +26,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index e34059c15..5ed4d6ab3 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -26,6 +26,6 @@ RUN /usr/local/bin/apt-install \ && mkdir -p /var/lock/apache2 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index a33c97406..d1a2b950c 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index b80593bdb..b549fb21d 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 7a6961fea..706919b2e 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-apache/ubuntu-16.10/Dockerfile b/docker/php-apache/ubuntu-16.10/Dockerfile index ebef86d2e..2c71484b3 100644 --- a/docker/php-apache/ubuntu-16.10/Dockerfile +++ b/docker/php-apache/ubuntu-16.10/Dockerfile @@ -24,6 +24,6 @@ RUN /usr/local/bin/apt-install \ && a2enmod actions proxy proxy_fcgi ssl rewrite headers expires \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/docker/php-apache/ubuntu-16.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile index fed8b7583..1ebafdd2e 100644 --- a/docker/php-dev/5.6/Dockerfile +++ b/docker/php-dev/5.6/Dockerfile @@ -16,8 +16,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile index 251afff87..4337dde09 100644 --- a/docker/php-dev/7.0/Dockerfile +++ b/docker/php-dev/7.0/Dockerfile @@ -16,8 +16,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/7.1/Dockerfile b/docker/php-dev/7.1/Dockerfile index 8aec6e04b..b0eb188dd 100644 --- a/docker/php-dev/7.1/Dockerfile +++ b/docker/php-dev/7.1/Dockerfile @@ -16,8 +16,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ && pecl install xdebug \ && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/alpine-php5/Dockerfile b/docker/php-dev/alpine-php5/Dockerfile index 528840fc8..7057af4da 100644 --- a/docker/php-dev/alpine-php5/Dockerfile +++ b/docker/php-dev/alpine-php5/Dockerfile @@ -13,9 +13,11 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/alpine-php7/Dockerfile b/docker/php-dev/alpine-php7/Dockerfile index 27cf3e7a3..6e0f23d62 100644 --- a/docker/php-dev/alpine-php7/Dockerfile +++ b/docker/php-dev/alpine-php7/Dockerfile @@ -14,8 +14,7 @@ RUN /usr/local/bin/apk-install \ # Install php development stuff php7-xdebug \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile index ad2472d49..674beddbf 100644 --- a/docker/php-dev/centos-7-php56/Dockerfile +++ b/docker/php-dev/centos-7-php56/Dockerfile @@ -15,9 +15,11 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup 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 index dce03a1cc..faf05f8de 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7-php7/Dockerfile b/docker/php-dev/centos-7-php7/Dockerfile index 42ff1dcc4..a1f40a005 100644 --- a/docker/php-dev/centos-7-php7/Dockerfile +++ b/docker/php-dev/centos-7-php7/Dockerfile @@ -16,8 +16,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y blackfire-php \ blackfire-agent \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 3b6e68970..524665a41 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -16,9 +16,11 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 811ba7d22..e463811db 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 1e7eafc89..d97145704 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -18,8 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index 791d85189..f472d5819 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 7ba4b65dc..5d8938dae 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -18,8 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 2473933ea..47c604c29 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 0b7637049..48d76f324 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index 3c9b992ed..a93d8b132 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index 14d9b30d1..8e7e3373e 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -17,9 +17,11 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index 08d312040..7403ae880 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -18,8 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-dev/ubuntu-16.10/Dockerfile b/docker/php-dev/ubuntu-16.10/Dockerfile index d0f62b3f0..f236a7397 100644 --- a/docker/php-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-dev/ubuntu-16.10/Dockerfile @@ -18,8 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ blackfire-php \ blackfire-agent \ # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix \ + && docker-service-enable syslog ssh postfix \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile index 33fb3bcbf..d90a6c753 100644 --- a/docker/php-nginx-dev/5.6/Dockerfile +++ b/docker/php-nginx-dev/5.6/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/5.6/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile index 7890f7dde..a8373c551 100644 --- a/docker/php-nginx-dev/7.0/Dockerfile +++ b/docker/php-nginx-dev/7.0/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/7.0/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/7.1/Dockerfile b/docker/php-nginx-dev/7.1/Dockerfile index 7cb438344..0b1f7775e 100644 --- a/docker/php-nginx-dev/7.1/Dockerfile +++ b/docker/php-nginx-dev/7.1/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/7.1/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-php5/Dockerfile b/docker/php-nginx-dev/alpine-php5/Dockerfile index 67fc7b31f..a028d3d80 100644 --- a/docker/php-nginx-dev/alpine-php5/Dockerfile +++ b/docker/php-nginx-dev/alpine-php5/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-php5/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/alpine-php7/Dockerfile b/docker/php-nginx-dev/alpine-php7/Dockerfile index 88393d256..6130a5c0b 100644 --- a/docker/php-nginx-dev/alpine-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-php7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/alpine-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile index 26d97c633..c37513757 100644 --- a/docker/php-nginx-dev/centos-7-php56/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 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 index dce03a1cc..faf05f8de 100644 --- 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 @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7-php7/Dockerfile b/docker/php-nginx-dev/centos-7-php7/Dockerfile index fde569e3b..0f3f94e2a 100644 --- a/docker/php-nginx-dev/centos-7-php7/Dockerfile +++ b/docker/php-nginx-dev/centos-7-php7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index ac768f4b4..61d9f64e5 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/yum-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 85255c2e7..a2a52833c 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 370c79478..abdf9664f 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index b4efc399a..c5b3645d4 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index ef61881ad..79caf2ff0 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index 709544610..42b1875d7 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index 6fddb112b..c94164426 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 2c95afe38..c80a82263 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index 3758eac1f..ca9705709 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index ebc9fd864..457ca1849 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile index b1318bb9c..a4094fe84 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.10/Dockerfile @@ -18,6 +18,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/docker/php-nginx-dev/ubuntu-16.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/docker/php-nginx/5.6/Dockerfile b/docker/php-nginx/5.6/Dockerfile index c0e11a920..c4f345681 100644 --- a/docker/php-nginx/5.6/Dockerfile +++ b/docker/php-nginx/5.6/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.0/Dockerfile b/docker/php-nginx/7.0/Dockerfile index 47faf6f07..dd2dff548 100644 --- a/docker/php-nginx/7.0/Dockerfile +++ b/docker/php-nginx/7.0/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/7.1/Dockerfile b/docker/php-nginx/7.1/Dockerfile index 25771451a..14b6a6841 100644 --- a/docker/php-nginx/7.1/Dockerfile +++ b/docker/php-nginx/7.1/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/alpine-php5/Dockerfile b/docker/php-nginx/alpine-php5/Dockerfile index 91e6e269a..956482262 100644 --- a/docker/php-nginx/alpine-php5/Dockerfile +++ b/docker/php-nginx/alpine-php5/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/alpine-php7/Dockerfile b/docker/php-nginx/alpine-php7/Dockerfile index a4096ee32..5790b131f 100644 --- a/docker/php-nginx/alpine-php7/Dockerfile +++ b/docker/php-nginx/alpine-php7/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apk-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile index 5b8041a5b..41a6f3e57 100644 --- a/docker/php-nginx/centos-7-php56/Dockerfile +++ b/docker/php-nginx/centos-7-php56/Dockerfile @@ -17,6 +17,6 @@ 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7-php7/Dockerfile b/docker/php-nginx/centos-7-php7/Dockerfile index 2fb4fa57a..425cc44ca 100644 --- a/docker/php-nginx/centos-7-php7/Dockerfile +++ b/docker/php-nginx/centos-7-php7/Dockerfile @@ -17,6 +17,6 @@ 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index 9f3578ccd..4d23b17f3 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -17,6 +17,6 @@ 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index e6eceb32f..9a7eeb839 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index aa13a2423..b1ac0a881 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 637fcffdf..6692d0b2c 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index f1b463881..8f05b3f5d 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 675c0a709..2f44211c6 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 4809ec3f5..4847da1a0 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 0fb79026d..457b2086f 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 3abbfc37c..1e635689f 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index 204ef7739..e059823fe 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-nginx/ubuntu-16.10/Dockerfile b/docker/php-nginx/ubuntu-16.10/Dockerfile index 00b36f982..22051484d 100644 --- a/docker/php-nginx/ubuntu-16.10/Dockerfile +++ b/docker/php-nginx/ubuntu-16.10/Dockerfile @@ -17,6 +17,6 @@ RUN /usr/local/bin/apt-install \ nginx \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 80 443 diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile index 3d7f12682..22afa0ef1 100644 --- a/docker/php-official/5.6/Dockerfile +++ b/docker/php-official/5.6/Dockerfile @@ -11,8 +11,8 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" @@ -28,12 +28,10 @@ COPY conf/ /opt/docker/ # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -42,9 +40,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -62,7 +57,7 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install ansible RUN /usr/local/bin/apt-install \ @@ -86,14 +81,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -101,12 +94,11 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -118,12 +110,10 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install php environment RUN /usr/local/bin/apt-install \ @@ -188,7 +178,7 @@ RUN /usr/local/bin/apt-install \ && 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/5.6/baselayout.tar b/docker/php-official/5.6/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 zcmV;0C3@OIT4*^jL0KkKS&Pr9OaLGRf4Beq0AT|%e)v8ExxJn}thfhZJOg%B1+Z$#?%d=$*#|c}r-vMnS8A%UcC$?lG6sbMRHl+uXcUD_Nvbgl3bCtZNjB5(h9pdY zO)&yA6!gf%X{qTwG|8fA`jP1Z4@ON#g*H?DRLPnXOrECDGziELO*Jx)N@kfNev}8K z0Avjf0BC3c4Lv{r0BRYfLTCU00000001XWQ000000#njNAuxbQ^%|axRP@Q}H6DhL zX{LZ=00xgl4XDwe&;UgsKt_q9Dd`%Xnwv=VBlMa^jj4zRgF&VvMokS37>xh`B1nM% zCPs;b(J>7LPiapI9-4vbHlxX?JwO0GKmY*$-w+`gpSR)pW%2%l;UI{*QRatWz97Y< zXdwikB!Gn4s3FoK6C8g3vVGDPt9`exy9)NA8bK8uf|n401{gNWIVFmj+8OvCed{dq zm}{23vBw;)Aro4~fWVAIh-^rs7%-_sAS41%AX0&1)KCaPgH%R_05lN-(u)M5APcmh zph`qaX#qtAp%oPop#*8Fp%q%CL0T4-2C9)pfuU8UMwCQQMuiats%QiiRizSuT2K-B zzL#gP?)m?=HRGH9eQ5bbq*0^fqN&19rHh3vl-(MoWyr=Vzj{GRT4+$Vqf1%kQKuL( zvQdKMaTaMa*WI7;O@2iA($IDMR|jxnjvgMVXB_9!``*S;7dpgAc|bIe<*q?U2_S^6 zLL(+kKb}cPbsl{*n@ioY0=CCyb1M*R`tdCwztJw7A0~FKg2qv@RPr=1*>)cqJ)D&` zkqxDLIqKXZ3o~t`z;=YL27$3=TH2_UJr@&(FD(C79E~qN=Vz7gJD8c6!VgAFy@KEb z@StPBL~Ph8Guq1anu8Xku7mFEUIZi&!N|avN6U=e+}UPlSchylQl!aC*O}pfoK_Pb zLP^PoPjxb>7aR)hm2!nE1+})Ma1!JsV3=0R^r|h9G5TMSAd1wcFM|2o7GTr7}9(V01ye*$v*rqmN=2K;Bs$!IPPL#{j47BunmCBrb6h;Wsvp#a!pKoy|mXf`plB#pvT35qYiZJ6%C5(rwq2}lZ zRMKZ-B2yJG6x!9KxM!ubt`={lappkocGIc#;(VvhTyer%D^Y zi8go1S~*dUT-ED5UAgx6-4C3H5Az#pdaz7|P^uZ@8mCLT=2uW#as$>+kV= z#7>YwC9y*^$hjV_E`U#LWW+4zdpspA0{H{GJl{NmT(FNY`>O(JNHY+3A^mgH0EQEX$8@#V+nvY=cNEj}<}Y^gj8ZlHn% z8^RX(c`Zxq1ZN_X&Drk$Bj^dQ9~(Yr!w{~?3u0yb3aW~#s;a80szkR|q8X6;$(I;L(KYR=i#aVe~uH?_d(08K~fJW@rC~hfHFtQrB(u@O6oq11v1o8HhOIT!k}3 z1`S7VsALHvh?sYHC-w02Vg!SAf#0^c9lN?qE>b8Adl(f?ISZY6GS=XUiFFSs=GsO zSiM-DiMF`3(n{9&;J{pjnjT)~r=)ZggE%dVeaN!%Q^wSxjZqK!q8Rr`gJeLPDw3+* zT!g!^OS``EtM4UN?nf@;tbFpTnd#HooI02HYPx{%$&=#J5=A=XB!rTuUEN*Xmmx0f zRW3qENh)30aw#M}DIYf)D~)zSvTLLygpiUFMI?lfn_bn&NeLk&B!rNX5<*Bx2_YwC z)#Daj-PPUSUcPh$3J<2DuNSyFgP@d*Uh1Ik;vntgmw$+FDQwsr@EHPx7X>Ac~u&HKM%j6`V;r8ON8=qI@S4E6i~_9CrIX{ZDUW!u z7{n)y*rF%gkohF9Tp^^2r<96~d~z6(?c#Xz&UopegX7FsoSD8Tbn|c35NGQV0sx7- zdxeHV>jS=s5fIv4ujR%y5Abnu>FPYV#W_e^iuU#L=_2;7nkR&Y=^YtNh-PMMm4M3A znTNWmDyovEgbT|-=j~1VelJW30|<5$2s|&Yq_D8S>&~qRWjS)EyLI{VQm(3$Dr+YJ zXR?bhKG4AtRz$!!h71x580Z-Gon{D6Y7^YsrQbp=C~4=U=4TA$mtnH{`;}Wj_fZX2uIeoc^&wpju;;{GuHQ$ z#T~_tcPlh{BUb2Zd@+{#aWl$_^|gs6o3-hc+=;T~3q14SpII$@Fcw9HjLK_BHNEH! zoxc0tIGKyy=NYs)!iMA-E!YI_fs=8(f=9C)(x5WB>3Dg>M^~vVs$@I-c0bMcUiP#B z>qF8mYssh>{#TYEFt+l^9sKAqazsPE{1C(E3iDqO*^r)R5{*U7=V((u>$^H<&DzJW+e zSO;BeNah4mj;C+fFNi)+C=Zjj_2KH^7{WDGQD|TcrKmyznZ^tlpcE8OhNus_N2;sv z-QC1uG)Z!;C*Lm$7%)*;6a}yQD!_EiAps-+i~)=QV-Xn;Nf81;MnxGAxonTGuW;yd(fDOWr-U$z zdhvtoRw5V>`F(fuFKM$avm4{P^390c={MwhxbOfne6LLCh7R9Z*aK3ir+c)}ki9C0 zkZ&*Ba#AcHLGK76XzFxfoq18rz+Px@$`45_lS?M~t7(}oLA`FltsSkt7{}Vy8`5hd zRAkhtgxVCF?S;aM`*k{*%#thI$pxinYVDDXS_DoveqiBuoJcE+VG0BOZ3;E$yNV&I z6Ey4{dq^^)Bby6ya$Ua--Z@`we)E8N&{6U^Zrg~Oa#wJe#<-fxU)>@iUu5|1bl6T* z^=7~k7y*Dzfz&GjwA&DrH1+7|uB5&8<#zVSw$AU_$ln;q5hDoc{cr^57sdh~Nf7u% zPveFE#0UjN{m}}7tM7mbCWc<;S*yeA%Ce*qC&|3z;|*&m0)p^&mvD>EIIv#?n-|Pl zbk1TZv-;QJQnye7LZG&%NY!iN=#vpGMZSDmrU^8G6AtX^PE<7#)?IF$bK4iMWDYNF z_aj7XI&93D7sRYXofwxO4%{#3RUyYz(@iHA0poohDx>V~0qp(%|F{2peP8#{(fjsx zFYu2e?HY$z44tNJ@=v}6o=@!QhjXt%@ojmz>)@D})(~vH7$ERE%aBr+T1Sz~bl>Zl ztbd|yD&c}(wlaN@!8~Q7z4NAB=w-Lz_A8Y-dMJz%c2~|eXWP(|%Sm3)$yGV-tt;WH z#Tap>lE(RsGkG;qi6GKZsi?w9k))X<)vRO!=BJ(_3P z+1cX1VU7zIJYAh0^MlOU785?nM^-kTTn=7F(%H*f+SSqVgw8ds_-bjAcSgAG<$Wu+ z8Y2W~eQ!D}@p)u?WY)8AbrW}v8^!H+TY8nw_a?*I$Wzm~($ti$bgvq`MkNOVmhJ^_MI$$f8Q$3m{l zjR1YAPzLe4Ius?jQb}_H8lvyn?vf%TWC%h-hclaPdm`t$?aQ6D%9s2dl!iG(E?{40 z>U>_PDAD|%SMmH(l&E`=Pj6ISiat~VkB{L!1LOHL=<-xN{~x{S^NN452oQI^zXE3% zQj8N};li=c?;H4$UBO~_PZ`We!-`gcSodlMtG_r%g#d^KbRd}|K!``7pZ3`+S2_PL zGt||cw-Pmmf!Ob2G1e5;>t_%b!W)ZDFtw?4!I*)UZyOw;1(hw2X5y{{35Z0ye$T~h zIK{8en=@o5ew)zD(Jcax3l)(??C-pr&E;)x|2c@;tgPY(Pc1Rmmz1ZfQ-T0=4LZTG z25{RrGEvX*%`v96wc5hcWbw`J$X~NvFmDUjnow`wSm>tGTk}vZ=*Zjj^vhSa6+2Wl(*EaSEv9I0CU$YO%OCdo17*22aZbk$lcWoQ=$bjM5v&T6o7YhEjd^V z0#={~3$)&hZ=i)P4ey?>QD4eg^nJ6FhremA9cAs5GhSb261aYKQ-J$o2ErgigTvAU z7?CYdsmrsyXG`z^2%<32$8)2jFegOYq)k3Ms6S8i7Lrj%@RbsxMj&UqWd~&*XG&33 z6;`DcBCG5&d3|kw+y<0aN9^TGI)8h;w@kbEwCkOkk zXR??`gC)3ggGHp!jU7Oa^oa+8+mE^df%kZn6<;CHib4T^ z3G6XHZOe(VV4VfS6WVlWz+c>i0OK5>ra=OspGpSke*zcTiPo*#uC0aU7QdOIxxDhS zfD~*t0Kh^VE5@|;vXdXv7e+_R$Y&*bQY9%JRSu)2k#^<-J3Ly}lO04OB0P}HCNO5I z)TByMJyxlx+pev^c8OT$QWS9w@D7l*opu*r6?pPLE5yVQ=f;4M2{-2cqMd6T1FUdg zqUO!Q2otlnSOVQD&0rz_m<=Wke&lh5jExQvKyQ5N%S{O<-{opwFojfk>_Rh>$Ukh5( zydmMh>|MJ+EN`Ia10-+I1L`|uCISo!{D5=~{PsK`PSDYPq;DJm1eU5mJzTq-(OEP_ z6m%=yPgVur(ib?J^K$TYj)Li=%Zt4;a`1O-RcIUn8`CLAcYj}er2u(U1`bmcvoU)R z@`wx^rV$(|UIPHHa1_)9i$K@ZkdRKkK`sM=5Q~6g;Cu?_!wJ->D%Q5VZ&)yZxB>*W zT(cKzy1iIR8W}d|0Kt_^2^-0C9p&x26)Ousra`EH3Yc>vM_k>F?<~G1>!3C21qmQ= zK&hzsQ($$JCPB2>;PBI;X9KA!3P+~;N zj-HgxOW%Su@8EHL)RUlf2A)t9qj(`t4k75kd(9fE9Q(PkI4J?Pz8tWn%=q>CLz5Y- zL^Y0aS~X-BrD65hh>cNbC3~o`fqYyp49#L9(wtU}Sp_kGY)7(qUj^Z`;2D{xJpeF? zfKx_wVM=*sL;apLcI~pM(IN<`H`&LpvpCUIi5eE9kgRM=B$co|g7xgMWgYR&rJ-nn zuprz3NKGQ`_S_5(`F^s31aj=_rycdb5huyjxuADwWFf-!q^AhRu>o4HtyB>041_mY zG`+knw+>uzH;5omXL~L;AAAfT9m^gtg2D;#?Fe3LYmx9!5qt>7z*MdgW@RM-7HG!F z39L>I>I`d*gf?}82py|oDd7~7b=?rn5hMsxtVfriMAJC{%^-;>NUTD`a~cTKlVzSk z5^Filc)g4O?(We65^FilTX7IXx`ExxyN?HdzurB~;}2Gmah#5g;|`i0+rSDtx`7fG z>7I7q%QMnorpKtY!}3Ad*D63LE$7#aAej58{vKC9gC5V8lV6IJkt|Mu`dO#-Y$)h_ z`k%6L`;T*P7qOpMSMtd>E!_wNQV4vxx1_79T;AI0qC>4Rk4Ke%_1Pc_# zM3Snih=_=Ys;a1&;IPy^A-LQd6y<*B`Rj}>F^n0`vPelJpJK8f1%2KSB#C7lc2!s( ze{Z7pOj#S3d+NGyRac0jjze)saViDlr(Y~%7{tPw^yjQ&2tbmEh)E=&FeIQvL=qxD zK2|$1XR|XAfO=4;A5m3Re$^GIbn1R?F}ZRQ?!}F^>~!1l_+L3DF>+$@B*r%fFgnA{ zso@AoVZb|%A;2}-g(jDcbkJ# zv|Th>1;@GekqOL|u%?wESNiWtdWQ8bcENf{J4>RIpqhcSOJ|s=nbgL&0sC zAqgQQSX|LuwFN%$4rl5ix<^O>Z?gW-);?j7K(LU3;vM1F!%0e9O9xO);#km2kJK8` z+#CwkBf5z(=FCYP3{ZfJD`E>UeQo}dwL+%y!S0`*aBlP@0ufWW59)W8I-#LH&ZXV6 zQMtLl%fo<%(y1j-S%eG~MsCw|dXpy%;fRE)aW-kvvfPfOb{9#g>$p_lEZxHDAd__nePtSptoE zb38|O%mnV9@QC*z>@La#4GSnZunWCt{bI;<(kqqnlM1MouL{WKhUYJ?#| zMu-p7(^xFfDdmx#l?W!%gbP8iSa@bzgKNSrWf(R(_s7{HTLY#cVAudb%y#Qm3@9PD zh*^Iji^d0mriMER{0T*ka?`Z-+rhv$B_K%v%r41Y=~WY1Rh(;=Vi|$Ls0*Hf16bm& zq<&k2KZ+dU6m3w@VCy3dtB|h`pcEGRCB>jnUIx**aWRfSO7U-z2pI+edS}*Se;XP=pG$iN6X0g$4vs41J44R zBlVs#fMQZYL4{C(km&NE0+LO_&=a8xSVEn&fmIT_m`5<6$io~8T6G{w-l`N_h@PY~ z8CYAVUQq)(5G@Rlt%Z5a7H}pQkmhc9d#r_Bkm}Own~d3Dd7_7V5Gz0+MkhigyR1?} zImP99xC@157?^yH29q$ixuy?+g)yN5aRb^gL_vt`TZ16WPUNL?(m^h4tueJb0pc+5goDJ^7;ci_ zXjs^9H{W7yRHBjI@1g#D8w+wMf1<(q*JOa8wdQ?s2z*Ua#i0*t+~R8Fl%(uAZsmLY zaF)s$IU{@D7d*>x1CU~h3*qanADo_n%yppzQEqz!dxpq9r zmJTJ9p<9u`g*EQn2Xa@l7@jwa!DuPU>T?PL=!iArH8>-ZnNtpu335~}5U5_Y0w;QH^WtwN9~)pi^=>RLPCyB}k64iO zjS#i(a4b6pgDxHFzawGqYF8a-xC5iw3QEBqO~UG4o$$541bh8{8B7FlXI#xgz19TZ z-hH#(5|SO;>I`+kMJzx>2(93T6ie7IY7v!J3s42FZ{c3i1Pk{cP+ZLjpE*B;A8g3L zTwo|KI9&Sx<{i)>Vcrm3bA0zm#VQ0vYL#1P8t6hGm0+^9^K=8Nd7AM81OcrZ2J@~v z!zTeV4NhJeuew?%dP_4(``!*PMQJ=NpxEe+ zb|Y@VFgF_Ip_RkH3#sxf93N+l@;bXBTWU&u@eA0{^E?N*HirY$H->6qyWQtF;2>%0 z<|h~u1_2Bh9yA)P6cBsfPz{_=s}Qh3gi;bwy3K?vDTo`xfY9U#hDAq{7$PqXfqGDw z9Xb6QliCHEHc+Kw21u%Z??b(YiK&Xj-WXfMQ{FaVdmJHcd^#CKiNXrD6UUpk$a} zftlaLt3kN?#13Lt#&8G$huo5Rh;IZdA_tiit~$y{AEYn~mlLa9E`E>3U>?9UIr1)cLWY1o&l*}R zR#-ap0^zTD)R66m#!Zvb90(iN@9qRS^iblkPt`T1Bh~CeGaah#!QAWgjM1}wtB*pA z9EWk0<+nj7o7q6)&*pX408Es3$|ffk}jbrM1JnhGiEU z$bB4*1ApZy{Cy{N9(Oe^v^LSOMv6t`103y$n3#qt$`0mtk zjTjF)EFoj8Io9O+{t{u}bq(fMZ`#wbc^x~s9Sws37{Kdd1|<&Gg!19uCcRBdjB#os z#T%}zM{PlS2!YTR%|Q1Mhf?+45+Yq1z3&1@LR^~04qSoaeeg%h-pU;8Pg7Qs z86)>VTM;Q{0l}c)(E8y}RZ*{pLAG5~XzFPAHkU>|hmO=%Y3t3y!*%p{TyQu_U_cGz0PDU^hv_b!C*3L4y znFw0bltzIviZfK#rnGU?9?=bbWHSY_VdG?7cHtc@PtWb>a=uQDf1cF{;~K_FV4umIn93e_&T< z0ndfn+^b_DDO;+jtdu}aS?(*h2I|0^?D85mE9iX7R!Fs%UfTB=0@^rTcNVpipDN&%-hD(U% zf#{H=bq4N@nciTMLJ=Vi3)swufO9)hd4iT-A5W;s9d*9PceGP^|AaAjY|(-UQIUdz z1PJhE7>)e8vfMkvSaX`n4=!gfh%z-JFv$wd9+FxzlzUK>frg!({ceS|?gk)@JD_u% zos&M;a1Msj7>3g#gw!U3HpBKuz?SgaTnmn}YDhKM$*2RWj&8D24_btfpx7j$%&zo^ zA>-j|-Ds=JcJ_9AERHy%kibLqdxGas>UkD1UC!{ex0XQsHkuu(4P5yCLJ*!sP6uJI vD*$x?$ViwHeu3}r*O%Mk|*~qdST!Y2l%^^DZ+$=UVTbnYHjs~ literal 9100 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 diff --git a/docker/php-official/5.6/conf/bin/bootstrap.sh b/docker/php-official/5.6/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/php-official/5.6/conf/bin/bootstrap.sh +++ b/docker/php-official/5.6/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/php-official/5.6/conf/bin/config.sh b/docker/php-official/5.6/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/php-official/5.6/conf/bin/config.sh +++ b/docker/php-official/5.6/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/php-official/5.6/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/php-official/5.6/conf/bin/entrypoint.sh b/docker/php-official/5.6/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/php-official/5.6/conf/bin/entrypoint.sh +++ b/docker/php-official/5.6/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/php-official/5.6/conf/bin/logwatch.sh b/docker/php-official/5.6/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/php-official/5.6/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/php-official/5.6/conf/bin/provision.sh b/docker/php-official/5.6/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/php-official/5.6/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-provision b/docker/php-official/5.6/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/5.6/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable +++ b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable +++ b/docker/php-official/5.6/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf b/docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/php-official/5.6/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -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-official/5.6/conf/etc/supervisor.d/syslog.conf b/docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/5.6/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/php-official/5.6/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/php-official/5.6/conf/provision/service.d/cron.sh b/docker/php-official/5.6/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/php-official/5.6/conf/provision/service.d/cron.sh +++ b/docker/php-official/5.6/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/5.6/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/5.6/conf/provision/service.d/postfix.sh b/docker/php-official/5.6/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/php-official/5.6/conf/provision/service.d/postfix.sh +++ b/docker/php-official/5.6/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/5.6/conf/provision/service.d/ssh.sh b/docker/php-official/5.6/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/php-official/5.6/conf/provision/service.d/ssh.sh +++ b/docker/php-official/5.6/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/php-official/5.6/conf/provision/service.d/syslog.sh b/docker/php-official/5.6/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/php-official/5.6/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/5.6/conf/provision/variables-webdevops.yml b/docker/php-official/5.6/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/5.6/conf/provision/variables-webdevops.yml +++ b/docker/php-official/5.6/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/5.6/conf/provision/variables.yml b/docker/php-official/5.6/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/5.6/conf/provision/variables.yml +++ b/docker/php-official/5.6/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile index 6e3e1f571..b2a91f8bc 100644 --- a/docker/php-official/7.0/Dockerfile +++ b/docker/php-official/7.0/Dockerfile @@ -11,8 +11,8 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" @@ -28,12 +28,10 @@ COPY conf/ /opt/docker/ # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -42,9 +40,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -62,7 +57,7 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install ansible RUN /usr/local/bin/apt-install \ @@ -86,14 +81,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -101,12 +94,11 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -118,12 +110,10 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install php environment RUN /usr/local/bin/apt-install \ @@ -188,7 +178,7 @@ RUN /usr/local/bin/apt-install \ && 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.0/baselayout.tar b/docker/php-official/7.0/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 zcmV;7BXitBT4*^jL0KkKS*nBfp8y_Cf3^L*0APRr|NsC0|NsC0|No!?1ONa60RRLD zU@PAEJ_p|S&zq*)PpGH27_9Cu|Zef;1nGUG9sH08Z?1D zLrqPhYJQ~JY95K{q74{;F$Rp9KUC0Y0MkLBOn^kwNuY>W@$ZMw&fCKs_}w8UO}>28MtHr=*BNVrZw7^vIpY)Owl#9-spt2jn1s#qSp<>&xId z2qG(%xhOUf+zZKx0x5`qh)u!*^MVBV{hx2nO)Kr$h7^6ap4AjxWQOET5FoBCNJ2&h z{94Oqdo6|Xmn!*E1PvA}2*x5nHl$d{RH~wsAQUJ?0>mI7L5T}AF+zeMLV^ejxIqXo zgc!giBnc=*MMP*p8fvITR;f@{g{48Nq*0(~RcTSB5fl-jL_unr0R>fQM4%Rw1b!Ze zwC(#}zJFK0FZnj3=N6GhkD7|72|c*DQrS(>s#aW#VypbJ3R2TTg|!-5&nk^L!IhGX z7bA$XNuHhg{}k8ePqi%vU+}me5K9>K?u21gwslN3<;iDuW|nY@pEE5P0nq{ntq4Xv znP!SgE$g#wBE z)VAK&4YnPT&iEE8zfF&(HiNU3CrvxUOOq3?pBy!aVKLs}K;R|FNW?I$_wDT{zGUC> zej*2G5J$dS;@^p4{I zJEuv?p=@pg!?VNXhRvUD$o=8W{m*yOdE4f{?mLT3{lk}Z8f&F z!n|u-d8^M|_3s#yGSae;MN2X~SRWS6DLFCH=t_A?QjIb}CO(v^mg;)X5koEp$h7#E zhWsMDn_h_Fx$}ORZ;hqPHo4o3X_VS~*PCOX6HODUTW715I9GmDMhL=jwcd*Oys~_y z-6Or_ywpVJP5OJ(&GR+CWx7@KlO7b-`kg0y;W=6-j;1b%2Go_Zcscwr z6pB`IJ?jpVKKFfa_;u;lf{Zxc4&6H7_^o$j+s90{i+p<$Z7-E+^P?Jamz+GlOZhuO z2!i+xr9x)f<>+wND<@bxjg_$8Ah&+c6`fx*`1Sk(WJC~EP=x{}=$%#wSchD@WFB!L zKVga;I7D>$I~vXUw;}l87u*eaHtTG{hdIe-PC0}87Wd~g+|E|c=nmnUPA#8E^Gv9X zTo4VuJEQE5(NU2A`x*$e`BCMSNx58`FCV)NZ$~`8vkb-`g~RG-f(6{dE_L|vzIcS&Lk{jr~>Ah+(wn za*nAai%Kb6Qa2^DP51J&a6?6OMO6)$?IW}+!Qjz^>Q=q?f*5@+_kJKQ_P22PERti$ zvv3S`ZCuS2mSw(g#1PH;<;X(>eaN;5+QT8zoz!DBiG3asOfOFqe zTzNq|32%@J>yhwsgpiUFMI?lfk`h8lNeLk&B!rNX5<*X3XRlP&wb45z{yD=q_IP|) zJMv9EoOQ-kQ%M~2tVK+TiAFwA-r)N8W-S|;W@NQ=xu7_Ty75U+Un#aguA-CyU#MEs-|;yQg-oiVk6p`X^Yv3i60I9 zZVVo(4b2yLyki{U>9|Q0k_f4~V^FWSg=Z2>UzfrY+I1OTLy6Jnf5fq}<5K7gDW5e= zlQ2fKhjGU_q7IZpZh{RYRXk)=Yvqu{k7pCho^!`d3?D9HyyVTvQXE&~d(k@tf&nel z&=d+4!=m*Hs*STtx9Y0U?i!qWx{od~PEr>ly}dbg$i1tkiQgf*L~7(SGdInE&7I6e z)k#%Ul{Emns5?)7-=o!WAYjL)lK^^cs+35mt&%%bAj)!vFAi)oQj)5a6)XUb5u!FW z;GqbsA}92W({0$k{aaAf8LYT+JLx_9zp_xroFQd z%$`O%Q37|>TH-xVCDQ$KUb*$}erznAxIc>)pM}%{z$>BO+XK71;l>Z5N4v7^ zcY#s}uM*Fk3g^qsocHaruU%9+?@KQ9sk8?+XNLZR z@AKku?&V>3cCNmPyF|*XT{CBM9F82%QLS1d66IiJ_McU@fDV+slX3z*S^Je$&yug3 z&%2Ito)f<2x^C?JTZ;Q1FjmLOx)OR-_XEER$U+hIt-fc5AmfGy&5ZTEBH5)F@$PJv_Kh3 z(Fh7>7%*ahP*FX#Kz&qt>c6_~?jsSROON*^>evGKJ?}ia?UNA245g7skK*ycqZotZS#ND4hsoaL=M~;Kx1NxC>GkR%6Fn0DK zfHkP6iW$(5yDB0-oh;$Y^su+6kUxO$t05YYf#UVTjvus0S`$O~{3B11 zZXT8bU{PmK%a>HcDjAx$FJr3G+ibzjt$YH|Hx#NRcUM%z2y$0=n8vu93t!g-ZTyp` zS*J4`H2fIc76EXsu?iJ{;_Zp04L-UKRzo&yLlZ0ozdjiKPfgbU*LESaEdPEkrGyiFsmC~WoCE&8FcBrJcG z*ti{J?tLAfc@;Y|S1)hvS2XMRD2x&8v84F4are>ltgmUZRZaOTO89E-j5nsT$1MiB zM4G8YkZCC3YA}*yX(mzCv3a!TrYYaECUj@3@SiMik3j^PmX(x(Dqu8i-JXEKqkTlk z4d_Qa6zUD`u$}}Ykg06rKQlpSvpyO(Z|!H^n~ionw$fZLYgbst6G`x`_TXuh?w<^IbH26Xy%B;m(#`(hspVfOZs!Sc72M?N6)J z;o*~OAhu`4ZWBjhVeam;NvzpOaHbefK*XVt@o{LNrN>>09obklz$VKX6%(0+6CrP=Y>dpuW+z=fp=X9zYTD*+X9HGvsGz`$G|t}(HIG4Ne_N`>y^L&b20QXx zDqtv?S8D^2>YIoF7;p;tqU<#w2BZK|yGcoDpDaUU0i^O`XH!cG50PXu?%k#J0@_++ zfkk0i{iBMF~QR@dbuZ07-xe+W;ugD;oyYn%n>sC%gHR(vQ;*-9=0t zj&BuS;a_6Uhs5OJ@!D&LS$ky+*O${JaQZ5o2j_?#7(%X}%d7)hS%Rz+{kmB7ysKOW zOSiJlzAkW_R_&>$$9+GW_l+c?kNQf9Q6msD*#ngx)2kq=imOtJkyZHe`F#6TW{T$h z-d}k1d|uC1;*DGcdX3s7-J8WYeF)L0g5Jg4M_JK6N{NZ6>_wN3GY>w$UY1}iYY1uU zXW2iph+eCHSHP1qB&6>MTof{(2xZT>eKnE7Ax@UHM1wOVr0)n;P|AQIjr_m^f%+g| zgbEgR%%9oMjs^x0w^J8w$KL?J`}~S(zC)oDgaZH**kXRmmlJA1I;dfZ?m9GJFYQ7A zagI<^Ac0WNr2}+7c?<2t?yGj}t6_PCukAEfH>OrVEOR-83QeoMY3*iAe!#jiMtlZx zSfwW^Nb0C{9hODnuCEoXWXC}?WJr=3guTqwT9llnBdVd)UdXxv=|`FzDB>I-9bs!b zEH2I}@#J5UkDC3c;@be<`}P;8^-_vC6WMo z@Z&HOCWxYrg?OjIfp_tR&L;fayc~x?bkb$zD^i6fi^gjPFoSu@ag7>uY2MU5N-7#^ z{OP8dbjarH%&cZ>N0|%pK!&Jr_KGNZ4#553Jb=^#jx`0g9TGKj@hT{as99VM7&;w(uUH)HwU`m>k}y;clTMuZXCIIZrf+NbM|>1x02cCo%Tna zXw{Hjs?Igoh>cNbC3~o`fqYyp49#ab+D|?EvA-p!5yd@En;E08iPjq%9lL-snF&zZ zSyXmxKW}|qyKJg;q(K!X`#ALM&NNjj6%s~C3dY2;Nm~QOL%W@WDE3D-mW84Q(1UOR zAvB4*(%@is%lFC%5TlPxIB1$UN9PLNC?Xncgf_itCz>&=<`t_7)k6EG`Gz&9F-q95 ztvV>oFfb4o%3{(s*9w4lBzVNObYsiZr|Q|qeC1%Pcva=YS7}zpI9Mv!)#cI?V4aTo z3~P;qHuu2<4%D$kuCyyn{n9LxB^$iv--qN$*Uur0WRp3~aH7MJjYRe4+0!8r)!o;4 zv5`bXH0BW~ z7YT=6uk&>BxH}FvxzpLj&^~bG495Za2Ru5&hS8`!qy8ijH`XM(Gcze9l2bD>mna~( zHijb*UNh6bH*V>dd6|-`=!k+MA|t5OABkVH!UT~lqmIg}1MJ)3dnPQ6%fEFUI4Y~i zQAZ)Tq&XD=@zb-GF^pniO?q?Jbwou~B$ZWFQmTroLP;HapO+>(TCDc9twse^{EDip zkmbGl_(tW(OS={}+w3{({$BO+l4BPpFA_{+aB>5zJM}&2LQ4(-+Hnp6uH{u#+j^?& zw>=-oo4Rd&ZE?$S!0L9s4zqUywPMW;Y6^=S)!5AkGc%B2Jwc*|PyNXl&5@ZbFdiKj zvPGT6mKhF(L&~f$FNcjZlFxR}vVo z{N2CAt_Waun1{Z8P2s%sBv9@{^mrCK#QFD@cTElL&fk9yx*0SD?pzSV`Q@?l#*t36TO=V4P%o-RNng#4V(>MVJXMC$WqijqN++GIc ze146qfq&e3jLM1mONH&$-a!Mk1E*s16JVfWW4Sm?u=sh>`i6k}_UF|dm|`A=yv#XX@G`;LA=rhZx)ea85Op?ybEGnc+@?ie7sy@CpKjI} znP71Dm*;PF!_hn4whwv4^a~(SvrcEQckRGV>F)@Rni_?7KmmxT0>JY3?F-N*kdag) za40Y44|h-txCeE)0)oWp;G^;T1DT+wNapl#6cza0*^(QBxW6MySck&z4SOJSp-$C> zIh1tgSpoPEx2~ElJ#~a3LPm%W_!%Ld=G?k?h0HF94W9rSn4T* zl#pQ&10m8SKnh6o1ndQ@5-qL52D_L?FrdIN#{#mL1xECcr(z62O z7TK~^*~%7&1adP!zXeOPd!S$vtqzc-aKRIU+jEm=A)|LJ8mYFK&BCiDs6>sa>3OZ{ ztYwA;ijFX|*yU}Qkenk)1isqS8&k9%BM%5jJWYXy`7Q>9ji&>J_NL_uDIO0BAJ+!L z+=~ADKc#la3JYGQbKre&`rhXgUP($$XD$4%e})p-Lnk0_d*bJrZY#(!MFsKo*e}^9 zpmZIGK@?k_z~KUb^YrfL0JymwpDy;R^X0EqaeMJn<{1N{6yMK4Iz#7s*LAOJmVqI@ z&2R(@B|<&gl#2)$`JYGa4W{rrTov%zIBW0-hS<5Gxb@|-(}>iyiQ`BWFggW_cE^d( zO!EY?;{ebTC3z8Y0_L^P&t7t@au3E;IiVoXWXlCwaXR(Jb(1P#(n5?3Oav+ytw9sO zJ-kiizsB7(+;JDLB@o}leIZkvz?j@J3bAKV+AcMkN^f9Mv>YzrDJp_EIfCF`j%ZqJ zv>knoT0m)IPQviwZUZ^H9D6LYfZ3A40L=vnPR=wOn+o^-lfm$>i z4!H0Pj1hJ0IC30sfEQp)PAVX{)QTQft6ZSz@C*Xya6_~_!%^HD(u2p2!vM4d>9y$&zivuVpfJaac#pz{Zo13gv@q$+}1EkKZwoPN;@1RRg3 zGjjVe>fO<_2&dTu3TzO@G_8cjEU-2`)5>v}IOb2?nSlZDJdB5#mODhK**u^y5y8KPVQCgb^93F;X8_nL=b z)@FJR!WjW?gb#<)5~ir#gSjxt*a|vG8%Eaio(Ja`6kr=;hiIJWn6j9j#5u2B^-@6k zn1$e=Pk!RO*L{IF0BUy6yTGI_8|s1%kRj;w5G&YkIPWxGz@f7G1}Sf)$9gbeR0$U2 zV{=Nf&LKbsaw^agC8}r-3d-edM^Z9K10x_vDI&&dA?t-eKCyre1R1Syw#YFfm;g-9 z{loQw#^{;)xe3MshCwq(dEj+eKuYshVh2}B31V15gi;bwzRi#< zDX1Nx+&4J|gJFR3))HnNftpYrn|_Vy?gGsm3J%nE2Y@qJv=%8#RRno2)VxL0LmZJo zco#n4o)*CX!6b+TB!tMo53MuW%V+R8WVbtg_0QWWH+LrRcU<;P4%`LGE4B|xv167& zk_UaaTof0KaE88mK+y5%OG?3B zkprws{9}MX3_gh`feqk=U_d+JAnw>wK>VSAT)Oj!z47iog@NOh)0)wl2B5VYL9~sD zV*r}n2^l1Ph0gZ@#kaTbjUQZ12S6DRCvapQrBh&qdXR1I)5g^!_H^oIxwp8|)# zA@|m7Vd(%aeqX>~9>6p@axQa)4FG-KRJ2&Eur_D~!)F7$q2nL0vrnLR5OZJA%s}Vj z5a%ot>ljk-`n|XYYmr>GxlB97@M>(ToqW_`$nR@29&o8=<>BM>TQc?WmX@KT0Gcbb zP$eaZ?{CS>ba4nyVbPoulxtlGRGc*8!iV0FH>Yo(5&1s9BqjfJDjkm5@+T-l7cxUf zU~NJ?hgTsC0X*K~3Rox%cgM7jMb})&>Si1NAy47yJ81K{qUwg)HUQB;233HV96&li z0?&q(3pKA1*lV`(gHtW25Wt2ym{m6U{wyypWeBu1ykkMzyF#v2@&eTWprB5mo821` zDFRFY#>w;)f(D@t5ku95RaN)`{q4Bj-Pj@y0|zKgN(+!EGAIK;fy|^#Pq_%kPloy~ zJ%?Hn!Td(82{7@mzmu7tlLwbrj^Udw(O;gb?fm?1&$z0xuq1vVtuXU3QE_o zE1~l=51+CQcoWpuNeqGe;8=-EFb$CnktfqbM3P8H>%@emsGDMZv#SrMc3|C{bG025 zT~5k}286C!D43b16DA092c)cES41S070fuLp0gG#<@8yH)b^qA?+oA&Gg4J1MJZvD z-Bh)bNVh(&bQ`3(v@}zPLlEr<9z++oG$>QM<0G^z9f1P^0B|4&e+fFD*DfAUQQjNM zSKE<_8)yf790P;c(Y+`_xkAUv;TvvCy1O$)U8W;hZzb7;0%BhRkB1;_oyIRLKI?oS-xblu??^nrufML);;=zC$nzCLUG|mh6s}r|UShbU-)xOwsEa6a^># z$jLtLAV=@E(4N0|K-s_^fb;Y`JPU&&gWMRtABDy8Lt&rr)|)x8AzucY#Lp4X3UHbd zq~o3V0|77;fW!k|XNxeBxSQXOB8sPMkj2n>^NR79vqIEXqeRl{LXmK*HtIsqsA>#E z#<125N5C;mf)8+4X4SX}cmZ%-=?IUqzzr>=iNYq>5CMiI)0Q~V*ncUIIT+|u|JYpn z&Be74K!LR2V~v8O7VGrHM}XgjzILEa6b||<{KjqPvd3@ISPds#ID?^nw8GRakw4G+#OR$ z)?2fqTR>YjE^5^WOha)>H?GmYBXB-vcZgn*jHTdp17N-e$Ut$0W<#ju+FR>$j2s~9 z3+*%m?F9wu8LQ#y1%tPjqlkJ7p{$BvP;3Jw#WMi(NKiXNe^$)!Fi9Z@kcNfqW<$g} z9jZM6OD~tF)?^OK;bXhpiQ0ep16QAC1`vugXrO@w?ra*4eK&08J)yijP36a@Pq;RN zL82S%520KdkD3y&Fw?WUt?WxP4#u1S9oKfd%Aox>DGQDvLXC_%goHf2Z)Lexmhk7#*he_JI^x4 zE4|t>JtC diff --git a/docker/php-official/7.0/conf/bin/bootstrap.sh b/docker/php-official/7.0/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/php-official/7.0/conf/bin/bootstrap.sh +++ b/docker/php-official/7.0/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/php-official/7.0/conf/bin/config.sh b/docker/php-official/7.0/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/php-official/7.0/conf/bin/config.sh +++ b/docker/php-official/7.0/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/php-official/7.0/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/php-official/7.0/conf/bin/entrypoint.sh b/docker/php-official/7.0/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/php-official/7.0/conf/bin/entrypoint.sh +++ b/docker/php-official/7.0/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/php-official/7.0/conf/bin/logwatch.sh b/docker/php-official/7.0/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/php-official/7.0/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/php-official/7.0/conf/bin/provision.sh b/docker/php-official/7.0/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/php-official/7.0/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-provision b/docker/php-official/7.0/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/7.0/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable +++ b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable +++ b/docker/php-official/7.0/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf b/docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/php-official/7.0/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -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-official/7.0/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/7.0/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/php-official/7.0/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/php-official/7.0/conf/provision/service.d/cron.sh b/docker/php-official/7.0/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/php-official/7.0/conf/provision/service.d/cron.sh +++ b/docker/php-official/7.0/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/7.0/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/7.0/conf/provision/service.d/postfix.sh b/docker/php-official/7.0/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/php-official/7.0/conf/provision/service.d/postfix.sh +++ b/docker/php-official/7.0/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/7.0/conf/provision/service.d/ssh.sh b/docker/php-official/7.0/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/php-official/7.0/conf/provision/service.d/ssh.sh +++ b/docker/php-official/7.0/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/php-official/7.0/conf/provision/service.d/syslog.sh b/docker/php-official/7.0/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/php-official/7.0/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.0/conf/provision/variables-webdevops.yml b/docker/php-official/7.0/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/7.0/conf/provision/variables-webdevops.yml +++ b/docker/php-official/7.0/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.0/conf/provision/variables.yml b/docker/php-official/7.0/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/7.0/conf/provision/variables.yml +++ b/docker/php-official/7.0/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile index 100ae5c04..3c82e941b 100644 --- a/docker/php-official/7.1/Dockerfile +++ b/docker/php-official/7.1/Dockerfile @@ -11,8 +11,8 @@ LABEL maintainer=info@webdevops.io \ io.webdevops.version=1.5.0 ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ENV DOCKER_CONF_HOME=/opt/docker/ \ LOG_STDOUT="" \ LOG_STDERR="" @@ -28,12 +28,10 @@ COPY conf/ /opt/docker/ # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -42,9 +40,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -62,7 +57,7 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install ansible RUN /usr/local/bin/apt-install \ @@ -86,14 +81,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -101,12 +94,11 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -118,12 +110,10 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install php environment RUN /usr/local/bin/apt-install \ @@ -188,7 +178,7 @@ RUN /usr/local/bin/apt-install \ && 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 \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup WORKDIR / diff --git a/docker/php-official/7.1/baselayout.tar b/docker/php-official/7.1/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/php-official/7.1/conf/bin/bootstrap.sh b/docker/php-official/7.1/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/php-official/7.1/conf/bin/bootstrap.sh +++ b/docker/php-official/7.1/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/php-official/7.1/conf/bin/config.sh b/docker/php-official/7.1/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/php-official/7.1/conf/bin/config.sh +++ b/docker/php-official/7.1/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/php-official/7.1/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/php-official/7.1/conf/bin/entrypoint.sh b/docker/php-official/7.1/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/php-official/7.1/conf/bin/entrypoint.sh +++ b/docker/php-official/7.1/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/php-official/7.1/conf/bin/logwatch.sh b/docker/php-official/7.1/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/php-official/7.1/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/php-official/7.1/conf/bin/provision.sh b/docker/php-official/7.1/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/php-official/7.1/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-provision b/docker/php-official/7.1/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/php-official/7.1/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable +++ b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable +++ b/docker/php-official/7.1/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf b/docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/php-official/7.1/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -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-official/7.1/conf/etc/supervisor.d/syslog.conf b/docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/php-official/7.1/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/php-official/7.1/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/php-official/7.1/conf/provision/service.d/cron.sh b/docker/php-official/7.1/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/php-official/7.1/conf/provision/service.d/cron.sh +++ b/docker/php-official/7.1/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh +++ b/docker/php-official/7.1/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/7.1/conf/provision/service.d/postfix.sh b/docker/php-official/7.1/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/php-official/7.1/conf/provision/service.d/postfix.sh +++ b/docker/php-official/7.1/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/php-official/7.1/conf/provision/service.d/ssh.sh b/docker/php-official/7.1/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/php-official/7.1/conf/provision/service.d/ssh.sh +++ b/docker/php-official/7.1/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/php-official/7.1/conf/provision/service.d/syslog.sh b/docker/php-official/7.1/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/php-official/7.1/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/php-official/7.1/conf/provision/variables-webdevops.yml b/docker/php-official/7.1/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/7.1/conf/provision/variables-webdevops.yml +++ b/docker/php-official/7.1/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php-official/7.1/conf/provision/variables.yml b/docker/php-official/7.1/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/php-official/7.1/conf/provision/variables.yml +++ b/docker/php-official/7.1/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/php/5.6 b/docker/php/5.6 new file mode 120000 index 000000000..a857368d6 --- /dev/null +++ b/docker/php/5.6 @@ -0,0 +1 @@ +../php-official/5.6 \ No newline at end of file diff --git a/docker/php/5.6/Dockerfile b/docker/php/5.6/Dockerfile deleted file mode 100644 index d7d66a7e2..000000000 --- a/docker/php/5.6/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:5.6 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-official:5.6 diff --git a/docker/php/5.6/Dockerfile.jinja2 b/docker/php/5.6/Dockerfile.jinja2 deleted file mode 100644 index 8d1973015..000000000 --- a/docker/php/5.6/Dockerfile.jinja2 +++ /dev/null @@ -1 +0,0 @@ -{{ docker.from("php-official", "5.6") }} diff --git a/docker/php/7.0 b/docker/php/7.0 new file mode 120000 index 000000000..92dcdb94d --- /dev/null +++ b/docker/php/7.0 @@ -0,0 +1 @@ +../php-official/7.0 \ No newline at end of file diff --git a/docker/php/7.0/Dockerfile b/docker/php/7.0/Dockerfile deleted file mode 100644 index c2425168b..000000000 --- a/docker/php/7.0/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:7.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-official:7.0 diff --git a/docker/php/7.0/Dockerfile.jinja2 b/docker/php/7.0/Dockerfile.jinja2 deleted file mode 100644 index 338344d42..000000000 --- a/docker/php/7.0/Dockerfile.jinja2 +++ /dev/null @@ -1 +0,0 @@ -{{ docker.from("php-official", "7.0") }} diff --git a/docker/php/7.1 b/docker/php/7.1 new file mode 120000 index 000000000..0105923f0 --- /dev/null +++ b/docker/php/7.1 @@ -0,0 +1 @@ +../php-official/7.1 \ No newline at end of file diff --git a/docker/php/7.1/Dockerfile b/docker/php/7.1/Dockerfile deleted file mode 100644 index a2115db33..000000000 --- a/docker/php/7.1/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php:7.1 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-official:7.1 diff --git a/docker/php/7.1/Dockerfile.jinja2 b/docker/php/7.1/Dockerfile.jinja2 deleted file mode 100644 index f136c1425..000000000 --- a/docker/php/7.1/Dockerfile.jinja2 +++ /dev/null @@ -1 +0,0 @@ -{{ docker.from("php-official", "7.1") }} diff --git a/docker/php/alpine-php5/Dockerfile b/docker/php/alpine-php5/Dockerfile index 27d9c1216..a5a9b9f8d 100644 --- a/docker/php/alpine-php5/Dockerfile +++ b/docker/php/alpine-php5/Dockerfile @@ -68,9 +68,9 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/alpine-php7/Dockerfile b/docker/php/alpine-php7/Dockerfile index 7a080db9b..3fc98cffd 100644 --- a/docker/php/alpine-php7/Dockerfile +++ b/docker/php/alpine-php7/Dockerfile @@ -73,9 +73,9 @@ RUN /usr/local/bin/apk-install \ # PECL workaround, see webdevops/Dockerfile#78 && sed -i "s/ -n / /" $(which pecl) \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile index 535b1acb0..0295235c0 100644 --- a/docker/php/centos-7-php56/Dockerfile +++ b/docker/php/centos-7-php56/Dockerfile @@ -49,9 +49,9 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ # Cleanup && yum erase -y php-devel gcc \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile index dcad45ad2..2ea44b4cc 100644 --- a/docker/php/centos-7-php7/Dockerfile +++ b/docker/php/centos-7-php7/Dockerfile @@ -56,9 +56,9 @@ RUN rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm \ && echo "extension=redis.so" > /etc/php.d/redis.ini \ && yum remove -y ImageMagick-devel php70w-devel gcc make \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index d3666756c..c31b362e0 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -53,9 +53,9 @@ RUN /usr/local/bin/yum-install \ # Cleanup && yum erase -y php-devel gcc \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 9cd028b4c..0a4e5622e 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -42,9 +42,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index d4b20eaf0..19e33fc43 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -53,9 +53,9 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 8bb51115a..a28b2e17f 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -44,9 +44,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 627a90bf7..515c2546e 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -42,9 +42,9 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 71eefd405..c18fb39ea 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -43,9 +43,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 10a115587..f8db10ecb 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -44,9 +44,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index 3c8061625..62491719a 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -44,9 +44,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index 3aea3b00b..54e798966 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -44,9 +44,9 @@ RUN /usr/local/bin/apt-install \ && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index 5c7ac8c45..f77f8ae51 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -41,9 +41,9 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile index 494f08d41..d46d4e546 100644 --- a/docker/php/ubuntu-16.10/Dockerfile +++ b/docker/php/ubuntu-16.10/Dockerfile @@ -41,9 +41,9 @@ RUN /usr/local/bin/apt-install \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ # Enable php services - && docker-service-enable cron \ + && docker-service-enable syslog cron \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 9000 diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 4c75714d9..853021e2c 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -7,9 +7,9 @@ FROM webdevops/base-app:latest COPY conf/ /opt/docker/ -RUN /opt/docker/bin/control.sh service.enable postfix \ +RUN /opt/docker/bin/control.sh service.enable postfix syslog \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-postfix \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 25 465 587 diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index 9ac25b5f7..99f59f60b 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -11,19 +11,17 @@ FROM zendesk/samson:latest ############################################################################### ENV TERM="xterm" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" + LANG="C.UTF-8" \ + LC_ALL="C.UTF-8" ADD baselayout.tar / # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -32,9 +30,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -52,7 +47,7 @@ RUN set -x \ && wget -O /usr/local/bin/go-replace https://github.com/webdevops/goreplace/releases/download/$GOREPLACE_VERSION/gr-64-linux \ && chmod +x /usr/local/bin/go-replace \ && apt-get purge -y -f --force-yes wget dirmngr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ############################################################################### # Base @@ -86,14 +81,12 @@ RUN /usr/local/bin/apt-install \ build-essential \ libssl-dev \ libffi-dev \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Install packages RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -101,7 +94,7 @@ RUN chmod +x /opt/docker/bin/* \ && chmod +s /usr/local/bin/gosu \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ############################################################################### # Base-app @@ -116,7 +109,6 @@ ENV APPLICATION_USER=application \ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -128,12 +120,10 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base-app \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup ############################################################################### # Samson @@ -146,7 +136,7 @@ ENV SQLITE_CLEANUP_DAYS=0 # NGINX reverse proxy RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list \ - && curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add - \ + && curl -fsSL https://yum.dockerproject.org/gpg | apt-key add - \ && /usr/local/bin/apt-install \ # Install nginx nginx \ @@ -169,7 +159,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ ## Enable ansible for deployment user && chmod 755 /usr/local/bin/ansible* \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # NPM stack RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ @@ -179,7 +169,7 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - \ && npm install -g grunt-cli \ && npm install -g bower \ && npm install -g npm-cache \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Deployer stack RUN set -x \ @@ -201,7 +191,7 @@ RUN set -x \ && /tmp/magallanes/bin/mage install --installDir=/opt/magallanes \ && rm -rf /tmp/magallanes.tar.gz /tmp/magallanes/ \ && ln -s /opt/magallanes/latest/bin/mage /usr/bin/mage \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup # Upload ADD database.yml /app/config/database.yml diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/samson-deployment/latest/conf/bin/bootstrap.sh b/docker/samson-deployment/latest/conf/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/docker/samson-deployment/latest/conf/bin/bootstrap.sh +++ b/docker/samson-deployment/latest/conf/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/docker/samson-deployment/latest/conf/bin/config.sh b/docker/samson-deployment/latest/conf/bin/config.sh index 8a399464a..049756c26 100644 --- a/docker/samson-deployment/latest/conf/bin/config.sh +++ b/docker/samson-deployment/latest/conf/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh +++ b/docker/samson-deployment/latest/conf/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/docker/samson-deployment/latest/conf/bin/logwatch.sh b/docker/samson-deployment/latest/conf/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/docker/samson-deployment/latest/conf/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/docker/samson-deployment/latest/conf/bin/provision.sh b/docker/samson-deployment/latest/conf/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/docker/samson-deployment/latest/conf/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable +++ b/docker/samson-deployment/latest/conf/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog-ng.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf b/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/docker/samson-deployment/latest/conf/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/docker/samson-deployment/latest/conf/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/docker/samson-deployment/latest/conf/provision/service.d/cron.sh b/docker/samson-deployment/latest/conf/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/cron.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh b/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh +++ b/docker/samson-deployment/latest/conf/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh b/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/docker/samson-deployment/latest/conf/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml b/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml +++ b/docker/samson-deployment/latest/conf/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/samson-deployment/latest/conf/provision/variables.yml b/docker/samson-deployment/latest/conf/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/docker/samson-deployment/latest/conf/provision/variables.yml +++ b/docker/samson-deployment/latest/conf/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 901b4b776..144735627 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -31,4 +31,4 @@ RUN /usr/local/bin/apk-install \ && pip install t3fieldlisttable \ && pip install t3tablerows \ && pip install t3targets \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index b8c9d8229..c3b35619b 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -6,6 +6,6 @@ FROM webdevops/base-app:latest RUN /opt/docker/bin/control.sh service.enable ssh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 22 diff --git a/docker/typo3-solr/3.1/Dockerfile.jinja2 b/docker/typo3-solr/3.1/Dockerfile.jinja2 index 7cac98dac..de78ed477 100644 --- a/docker/typo3-solr/3.1/Dockerfile.jinja2 +++ b/docker/typo3-solr/3.1/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.general(charset="C.UTF-8") }} +{{ environment.general() }} USER root diff --git a/docker/typo3-solr/3.1/baselayout.tar b/docker/typo3-solr/3.1/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/typo3-solr/5.0/Dockerfile b/docker/typo3-solr/5.0/Dockerfile index 270d6b520..1582b8545 100644 --- a/docker/typo3-solr/5.0/Dockerfile +++ b/docker/typo3-solr/5.0/Dockerfile @@ -34,7 +34,7 @@ RUN pacman --sync --noconfirm --noprogressbar --quiet net-tools \ && mkdir -p /opt/solr/server/solr/data \ && ln -s /opt/solr/server/solr/data /opt/solr/server/solr/typo3cores/data \ && chown -R solr:solr /opt/solr/server/solr/ \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/5.0/Dockerfile.jinja2 b/docker/typo3-solr/5.0/Dockerfile.jinja2 index 6b371159a..0f69dea48 100644 --- a/docker/typo3-solr/5.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/5.0/Dockerfile.jinja2 @@ -2,7 +2,7 @@ {{ docker.version() }} -{{ environment.general(charset="C.UTF-8") }} +{{ environment.general() }} {{ typo3Solr.guywithnose(release="1.3.0") }} diff --git a/docker/typo3-solr/5.0/baselayout.tar b/docker/typo3-solr/5.0/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/typo3-solr/6.0/Dockerfile b/docker/typo3-solr/6.0/Dockerfile index 8f2b17ecf..9b57abe2c 100644 --- a/docker/typo3-solr/6.0/Dockerfile +++ b/docker/typo3-solr/6.0/Dockerfile @@ -27,7 +27,7 @@ RUN /usr/local/bin/apt-update \ && mv /tmp/solr /opt/solr/server/solr \ && mkdir -p /opt/solr/server/solr/data \ && chown -R solr:solr /opt/solr/server/solr \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup USER solr diff --git a/docker/typo3-solr/6.0/Dockerfile.jinja2 b/docker/typo3-solr/6.0/Dockerfile.jinja2 index 3f257ae1d..a144ca0a5 100644 --- a/docker/typo3-solr/6.0/Dockerfile.jinja2 +++ b/docker/typo3-solr/6.0/Dockerfile.jinja2 @@ -2,6 +2,6 @@ {{ docker.version() }} -{{ environment.general(charset="C.UTF-8") }} +{{ environment.general() }} {{ typo3Solr.official() }} diff --git a/docker/typo3-solr/6.0/baselayout.tar b/docker/typo3-solr/6.0/baselayout.tar index 297111d9775ff63dbdb5d8d6622c7f76e1a29b69..dc5fbe08f067a6a6ea174a182fb8c22479a06758 100644 GIT binary patch literal 9605 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 literal 9100 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 diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 7ff2c1f9f..ccb9fb188 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -18,7 +18,7 @@ COPY conf/ /opt/docker/ RUN /usr/local/bin/apk-install \ varnish \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup CMD ["varnishd"] diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index 9d09bea48..68a252eea 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -23,6 +23,6 @@ RUN /usr/local/bin/apt-install \ && /opt/docker/bin/provision add --tag entrypoint webdevops-vsftp \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-vsftp \ && /opt/docker/bin/bootstrap.sh \ - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup EXPOSE 20 21 12020 12021 12022 12023 12024 12025 diff --git a/foo b/foo new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/foo @@ -0,0 +1 @@ +1 diff --git a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml index 4df3436ce..c285be286 100644 --- a/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml +++ b/provisioning/apache/general/provision/roles/webdevops-apache/tasks/bootstrap.yml @@ -84,7 +84,7 @@ with_items: - 'a2dismod mpm_event' - 'a2enmod mpm_event' - when: (ansible_distribution == 'Ubuntu' and dockerimage_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 8) + when: (ansible_distribution == 'Ubuntu' and docker_image_info_distribution_version|int >= 14) or (ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 8) - name: Manage modules [Alpine family] lineinfile: diff --git a/provisioning/base/general/bin/bootstrap.sh b/provisioning/base/general/bin/bootstrap.sh index 85555ddcb..855c10782 100644 --- a/provisioning/base/general/bin/bootstrap.sh +++ b/provisioning/base/general/bin/bootstrap.sh @@ -17,6 +17,7 @@ rootCheck "$0" # Save the buildtime date +%s > /opt/docker/BUILDTIME +date +%s >/opt/docker/etc/.registry/image_info_buildtime # Make all scripts executable find /opt/docker/bin/ -type f -iname '*.sh' -print0 | xargs --no-run-if-empty -0 chmod +x @@ -49,6 +50,23 @@ case "$BOOTSTRAP_MODE" in echo "[ERROR] Bootstrap mode '$BOOTSTRAP_MODE' not defined" exit 1 ;; - esac + +###################### +# Check if entrypoint provisioning is available +###################### + +echo "Checking provision status..." +for PROVISION_TAG in onbuild build bootstrap entrypoint; do + ROLES=$(docker-provision list --tag "$PROVISION_TAG") + if [[ -n "$ROLES" ]]; then + PROVISION_ROLE_COUNT=$(echo "$ROLES" | wc -l) + echo " - found ${PROVISION_ROLE_COUNT} for provision tag ${PROVISION_TAG}, caching info for execution" + echo -n "$PROVISION_ROLE_COUNT" > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + else + echo " - no roles found for provision tag ${PROVISION_TAG}" + echo -n '' > "/opt/docker/etc/.registry/provision-availale.${PROVISION_TAG}" + fi +done + diff --git a/provisioning/base/general/bin/config.sh b/provisioning/base/general/bin/config.sh index 8a399464a..049756c26 100644 --- a/provisioning/base/general/bin/config.sh +++ b/provisioning/base/general/bin/config.sh @@ -2,11 +2,6 @@ shopt -s nullglob -IMAGE_FAMILY=$(cat /etc/dockerimage_distribution_family) -IMAGE_DISTRIBUTION=$(cat /etc/dockerimage_distribution) -IMAGE_DISTRIBUTION_VERSION=$(cat /etc/dockerimage_distribution_version) -IMAGE_DISTRIBUTION_CODENAME=$(cat /etc/dockerimage_lsb_codename) - ### # Check if current user is root # @@ -20,44 +15,23 @@ function rootCheck() { } ### - # Create named pipe - # - # $1 -> name of file - # - ## -function createNamedPipe() { - rm --force -- "$1" - mknod "$1" p -} - -### - # Escape value for sed usage - # - # $1 -> value - # STDOUT -> escaped value + # Create /docker.stdout and /docker.stderr # ## -function sedEscape() { - echo "$(echo $* |sed -e 's/[]\/$*.^|[]/\\&/g')" -} +function createDockerStdoutStderr() { + # link stdout from docker + if [[ -z "$LOG_STDOUT" ]]; then + LOG_STDOUT="/proc/$$/fd/1" + fi -### - # Replace text inside a file - # - # $1 -> source value - # $2 -> target value - # $3 -> path to file - # - ## -function replaceTextInFile() { - SOURCE="$(sedEscape $1)" - REPLACE="$(sedEscape $2)" - TARGET="$3" + if [[ -z "$LOG_STDERR" ]]; then + LOG_STDERR="/proc/$$/fd/2" + fi - sed -i "s/${SOURCE}/${REPLACE}/" "${TARGET}" + ln -f -s "$LOG_STDOUT" /docker.stdout + ln -f -s "$LOG_STDERR" /docker.stderr + chmod 600 /docker.stdout /docker.stderr } - - ### # Include script directory text inside a file # @@ -109,7 +83,7 @@ function runEntrypoints() { . /opt/docker/bin/entrypoint.d/default.sh fi - exit + exit 1 } ### @@ -166,6 +140,12 @@ function runProvisionEntrypoint() { function runDockerProvision() { ANSIBLE_TAG="$1" - /opt/docker/bin/provision run --tag "$ANSIBLE_TAG" --use-registry + PROVISION_STATS_FILE="/opt/docker/etc/.registry/provision-stats.${ANSIBLE_TAG}" + + # run provision if stats file doesn't exists (unknown mode) + # or if stats file is not empty + if [[ ! -f "$PROVISION_STATS_FILE" ]] || [[ -s "$PROVISION_STATS_FILE" ]]; then + /opt/docker/bin/provision run --tag "${ANSIBLE_TAG}" --use-registry + fi } diff --git a/provisioning/base/general/bin/entrypoint.d/cli.sh b/provisioning/base/general/bin/entrypoint.d/cli.sh index 2ca68926c..fe212a8ea 100644 --- a/provisioning/base/general/bin/entrypoint.d/cli.sh +++ b/provisioning/base/general/bin/entrypoint.d/cli.sh @@ -8,7 +8,7 @@ if [ -n "${CLI_SCRIPT}" ]; then if [ -n "$APPLICATION_USER" ]; then # Run as EFFECTIVE_USER shift - exec sudo -H -E -u "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" + exec gosu "${APPLICATION_USER}" ${CLI_SCRIPT} "$@" else # Run as root exec ${CLI_SCRIPT} "$@" diff --git a/provisioning/base/general/bin/entrypoint.d/noop.sh b/provisioning/base/general/bin/entrypoint.d/noop.sh index 967920837..092d55d8b 100644 --- a/provisioning/base/general/bin/entrypoint.d/noop.sh +++ b/provisioning/base/general/bin/entrypoint.d/noop.sh @@ -4,5 +4,4 @@ ## NOOP (no operation) ############################################# -tail -f /dev/null -exit +exec tail -f /dev/null diff --git a/provisioning/base/general/bin/entrypoint.d/supervisord.sh b/provisioning/base/general/bin/entrypoint.d/supervisord.sh index ead991551..f21489667 100644 --- a/provisioning/base/general/bin/entrypoint.d/supervisord.sh +++ b/provisioning/base/general/bin/entrypoint.d/supervisord.sh @@ -4,8 +4,6 @@ ## Supervisord (start daemons) ############################################# -rootCheck "supervisord" - ## Start services exec /opt/docker/bin/service.d/supervisor.sh diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh index 169a4bb88..01f59660c 100644 --- a/provisioning/base/general/bin/entrypoint.sh +++ b/provisioning/base/general/bin/entrypoint.sh @@ -20,24 +20,13 @@ chmod -s /usr/local/bin/gosu trap 'echo sigterm ; exit' SIGTERM trap 'echo sigkill ; exit' SIGKILL -# link stdout from docker -if [[ -z "$LOG_STDOUT" ]]; then - LOG_STDOUT="/proc/$$/fd/1" -fi - -if [[ -z "$LOG_STDERR" ]]; then - LOG_STDERR="/proc/$$/fd/2" -fi - -ln -f -s "$LOG_STDOUT" /docker.stdout -ln -f -s "$LOG_STDERR" /docker.stderr -chmod 600 /docker.stdout /docker.stderr - # sanitize input and set task TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" source /opt/docker/bin/config.sh +createDockerStdoutStderr + if [[ "$UID" -eq 0 ]]; then # Only run provision if user is root diff --git a/provisioning/base/general/bin/logwatch.sh b/provisioning/base/general/bin/logwatch.sh deleted file mode 100644 index 1a5b486c7..000000000 --- a/provisioning/base/general/bin/logwatch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -sleep 0.5 - -if [ -p "$2" ]; then - sed --unbuffered -e "s/^/\[$1\] /" -- "$2" -else - tail -n 0 -F -q "$2" | sed --unbuffered -e "s/^/\[$1\] /" -fi diff --git a/provisioning/base/general/bin/provision.sh b/provisioning/base/general/bin/provision.sh deleted file mode 100644 index 4079dd7f0..000000000 --- a/provisioning/base/general/bin/provision.sh +++ /dev/null @@ -1,30 +0,0 @@ - #!/usr/bin/env bash - -# -# Example: -# provision.sh /opt/foobar/playbook.yml tag -# -# - -set -o pipefail # trace ERR through pipes -set -o errtrace # trace ERR through 'time command' and other functions -set -o nounset ## set -u : exit the script if you try to use an uninitialised variable -set -o errexit ## set -e : exit the script if any statement returns a non-true return value - -. config.sh - -deprecationNotice " Please use >>/opt/docker/bin/provision run --playbook playbook.yml --tag=bootstrap [args]<< for running provision" - - -if [ "$#" -lt 2 ]; then - echo "[ERROR] $0: Playbook or tag is missing" - exit 1 -fi - -ANSIBLE_PLAYBOOK="$1" -shift -ANSIBLE_TAG="$1" -shift -ANSIBLE_OPTS="$@" - -/opt/docker/bin/provision run --playbook "${ANSIBLE_PLAYBOOK}" --use-registry --tag "${ANSIBLE_TAG}" $ANSIBLE_OPTS diff --git a/provisioning/base/general/bin/usr-bin/docker-provision b/provisioning/base/general/bin/usr-bin/docker-provision new file mode 100644 index 000000000..4ee715c64 --- /dev/null +++ b/provisioning/base/general/bin/usr-bin/docker-provision @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value + +# wrapper +exec /opt/docker/bin/provision "$@" diff --git a/provisioning/base/general/bin/usr-bin/docker-service-disable b/provisioning/base/general/bin/usr-bin/docker-service-disable index 8d91ee9a1..2b5b31bb4 100644 --- a/provisioning/base/general/bin/usr-bin/docker-service-disable +++ b/provisioning/base/general/bin/usr-bin/docker-service-disable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/provisioning/base/general/bin/usr-bin/docker-service-enable b/provisioning/base/general/bin/usr-bin/docker-service-enable index aa71a67b5..8d36a14a9 100644 --- a/provisioning/base/general/bin/usr-bin/docker-service-enable +++ b/provisioning/base/general/bin/usr-bin/docker-service-enable @@ -9,7 +9,7 @@ source /opt/docker/bin/config.sh rootCheck "$0" -if [[ "$#" -ne 1 ]]; then +if [[ "$#" -eq 0 ]]; then echo "Usage: $0 " exit 1 fi diff --git a/provisioning/base/general/etc/supervisor.d/syslog-ng.conf b/provisioning/base/general/etc/supervisor.d/syslog-ng.conf deleted file mode 100644 index 247fd1a25..000000000 --- a/provisioning/base/general/etc/supervisor.d/syslog-ng.conf +++ /dev/null @@ -1,13 +0,0 @@ -[group:syslog] -programs=syslogd -priority=10 - -[program:syslogd] -command = /opt/docker/bin/service.d/syslog-ng.sh -process_name=%(program_name)s -autostart = true -autorestart = true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 diff --git a/provisioning/base/general/etc/supervisor.d/syslog.conf b/provisioning/base/general/etc/supervisor.d/syslog.conf new file mode 100644 index 000000000..20d1e238c --- /dev/null +++ b/provisioning/base/general/etc/supervisor.d/syslog.conf @@ -0,0 +1,13 @@ +[group:syslog] +programs=syslogd +priority=10 + +[program:syslogd] +command = /opt/docker/bin/service.d/syslog-ng.sh +process_name=%(program_name)s +autostart = false +autorestart = true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml index 48a7a3abb..9f842336c 100644 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap.yml @@ -4,5 +4,5 @@ - include: bootstrap/misc.yml - include: bootstrap/root.yml - include: bootstrap/supervisor.yml -- include: bootstrap/syslog-ng.yml - include: bootstrap/pam.yml +- include: bootstrap/entrypoint.yml diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml new file mode 100644 index 000000000..d5d8809f4 --- /dev/null +++ b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/entrypoint.yml @@ -0,0 +1,8 @@ +--- + +- name: Create link for entrypoint + file: + src: '/opt/docker/bin/entrypoint.sh' + dest: '/entrypoint' + state: link + force: yes diff --git a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml b/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml deleted file mode 100644 index 27c8f6a30..000000000 --- a/provisioning/base/general/provision/roles/webdevops-base/tasks/bootstrap/syslog-ng.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- name: Get syslog-ng version - shell: "syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d ." - register: syslogng_version - -- name: Configure syslog-ng (default) - lineinfile: - dest: /etc/default/syslog-ng - regexp: '^[\s]*{{ item.key }}[\s]*=' - line: '{{ item.key }}="{{ item.value }}"' - create: yes - with_items: - - { key: 'SYSLOGNG_OPTS', value: '--no-caps' } - -- name: Enable syslog-ng config - file: - src: '/opt/docker/etc/syslog-ng/syslog-ng.conf' - dest: '/etc/syslog-ng/syslog-ng.conf' - state: link - force: yes - -- name: Set version of syslog-ng file - lineinfile: - dest: '/etc/syslog-ng/syslog-ng.conf' - regexp: '^@version:' - line: '@version: {{ syslogng_version.stdout }}' - -- name: Ensure /var/lib/syslog-ng exists - file: - path: '/var/lib/syslog-ng' - state: directory - recurse: yes diff --git a/provisioning/base/general/provision/service.d/cron.sh b/provisioning/base/general/provision/service.d/cron.sh index 84854094b..bd8a54781 100644 --- a/provisioning/base/general/provision/service.d/cron.sh +++ b/provisioning/base/general/provision/service.d/cron.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install cron diff --git a/provisioning/base/general/provision/service.d/dnsmasq.sh b/provisioning/base/general/provision/service.d/dnsmasq.sh index d87637948..9e5c3228c 100644 --- a/provisioning/base/general/provision/service.d/dnsmasq.sh +++ b/provisioning/base/general/provision/service.d/dnsmasq.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/provisioning/base/general/provision/service.d/postfix.sh b/provisioning/base/general/provision/service.d/postfix.sh index e3323c388..ff1879345 100644 --- a/provisioning/base/general/provision/service.d/postfix.sh +++ b/provisioning/base/general/provision/service.d/postfix.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + # Installation case "$IMAGE_FAMILY" in Debian|Ubuntu) diff --git a/provisioning/base/general/provision/service.d/ssh.sh b/provisioning/base/general/provision/service.d/ssh.sh index 550e81f79..63d7a9f3a 100644 --- a/provisioning/base/general/provision/service.d/ssh.sh +++ b/provisioning/base/general/provision/service.d/ssh.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +IMAGE_FAMILY=$(docker-image-info family) + case "$IMAGE_FAMILY" in Debian|Ubuntu) apt-install openssh-server diff --git a/provisioning/base/general/provision/service.d/syslog.sh b/provisioning/base/general/provision/service.d/syslog.sh new file mode 100644 index 000000000..7e8b8e0a9 --- /dev/null +++ b/provisioning/base/general/provision/service.d/syslog.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +IMAGE_FAMILY=$(docker-image-info family) + +# Installation +case "$IMAGE_FAMILY" in + Debian|Ubuntu) + apt-install syslog-ng syslog-ng-core + ;; + + RedHat) + yum-install syslog-ng + + # remove logrotate (not needed for docker) + rm -f "/etc/cron.daily/logrotate" + ;; + + Alpine) + apk-install syslog-ng + ;; +esac + +## Configuration +SYSLOG_NG_VERSION=$(syslog-ng --version | grep -E -e '^syslog-ng[ ]+[0-9]+\.[0-9]+' | head -n 1 | awk '{print $2}' | cut -f 1,2 -d .) + +# Disable caps inside container +if [[ -f /etc/default/syslog-ng ]]; then + go-replace --mode=lineinfile \ + -s "SYSLOGNG_OPTS" -r "SYSLOGNG_OPTS = --no-caps" \ + -- /etc/default/syslog-ng +fi + +# Symlink configuration +ln -s -f /opt/docker/etc/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf + +go-replace --mode=lineinfile \ + -s "@version" -r "@version: ${SYSLOG_NG_VERSION}" \ + -- /etc/syslog-ng/syslog-ng.conf + +# Ensure /var/lib/syslog-ng exists +mkdir -p /var/lib/syslog-ng diff --git a/provisioning/base/general/provision/variables-webdevops.yml b/provisioning/base/general/provision/variables-webdevops.yml index 481ee218e..0b2a21a95 100644 --- a/provisioning/base/general/provision/variables-webdevops.yml +++ b/provisioning/base/general/provision/variables-webdevops.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/provisioning/base/general/provision/variables.yml b/provisioning/base/general/provision/variables.yml index 481ee218e..0b2a21a95 100644 --- a/provisioning/base/general/provision/variables.yml +++ b/provisioning/base/general/provision/variables.yml @@ -1,7 +1,7 @@ --- -dockerimage_distribution_family: "{{ lookup('file', '/etc/dockerimage_distribution_family') }}" -dockerimage_distribution: "{{ lookup('file', '/etc/dockerimage_distribution') }}" -dockerimage_distribution_version: "{{ lookup('file', '/etc/dockerimage_distribution_version') }}" -dockerimage_lsb_release: "{{ lookup('file', '/etc/dockerimage_lsb_release') }}" -dockerimage_lsb_codename: "{{ lookup('file', '/etc/dockerimage_lsb_codename') }}" +docker_image_info_family: "{{ lookup('pipe', 'docker-image-info family') }}" +docker_image_info_distribution: "{{ lookup('pipe', 'docker-image-info dist') }}" +docker_image_info_distribution_version: "{{ lookup('pipe', 'docker-image-info dist-version') }}" +docker_image_info_distribution_release: "{{ lookup('pipe', 'docker-image-info dist-release') }}" +docker_image_info_distribution_codename: "{{ lookup('pipe', 'docker-image-info dist-codename') }}" diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml index dce03a1cc..faf05f8de 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -7,4 +7,4 @@ with_items: - /etc/php5/cli/conf.d/zz-blackfire.ini - /etc/php5/fpm/conf.d/zz-blackfire.ini - when: ansible_distribution == 'Debian' and dockerimage_distribution_version|int >= 7 + when: ansible_distribution == 'Debian' and docker_image_info_distribution_version|int >= 7 diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 9e7a522ad..dc17193b9 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -43,5 +43,5 @@ CMD ["{{ command }}"] {%- endmacro -%} {%- macro cleanup() -%} - && /usr/local/bin/docker-image-cleanup + && docker-image-cleanup {%- endmacro -%} diff --git a/template/Dockerfile/environment.jinja2 b/template/Dockerfile/environment.jinja2 index 3db8567e3..c043c76f1 100644 --- a/template/Dockerfile/environment.jinja2 +++ b/template/Dockerfile/environment.jinja2 @@ -1,4 +1,4 @@ -{% macro general(charset="en_US.UTF-8") -%} +{% macro general(charset="C.UTF-8") -%} ENV TERM="xterm" \ LANG="{{ charset }}" \ LC_ALL="{{ charset }}" diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2 index 808db028d..58ffaabf2 100644 --- a/template/Dockerfile/images/base.jinja2 +++ b/template/Dockerfile/images/base.jinja2 @@ -6,7 +6,6 @@ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apk-install \ supervisor \ - syslog-ng \ wget \ curl \ sed \ @@ -22,7 +21,6 @@ RUN chmod +x /opt/docker/bin/* \ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/yum-install \ supervisor \ - syslog-ng \ wget \ curl \ net-tools \ @@ -38,8 +36,6 @@ RUN chmod +x /opt/docker/bin/* \ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ @@ -55,8 +51,6 @@ RUN chmod +x /opt/docker/bin/* \ RUN chmod +x /opt/docker/bin/* \ && /usr/local/bin/apt-install \ supervisor \ - syslog-ng \ - syslog-ng-core \ wget \ curl \ net-tools \ diff --git a/template/Dockerfile/images/baseapp.jinja2 b/template/Dockerfile/images/baseapp.jinja2 index b39e7db41..9bb80b19d 100644 --- a/template/Dockerfile/images/baseapp.jinja2 +++ b/template/Dockerfile/images/baseapp.jinja2 @@ -5,7 +5,6 @@ RUN /usr/local/bin/apk-install-edge shadow \ && /usr/local/bin/apk-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -17,8 +16,6 @@ RUN /usr/local/bin/apk-install-edge shadow \ openssh-client \ rsync \ git \ - nano \ - vim \ {{ provision.runRoleInline('base-app', role) }} \ {{ docker.cleanup() }} {%- endmacro %} @@ -28,7 +25,6 @@ RUN /usr/local/bin/apk-install-edge shadow \ # Install services RUN /usr/local/bin/yum-install \ # Install tools - sudo \ zip \ unzip \ bzip2 \ @@ -41,8 +37,6 @@ RUN /usr/local/bin/yum-install \ rsync \ git \ pygpgme \ - nano \ - vim \ && /usr/local/bin/generate-locales \ {{ provision.runRoleInline('base-app', role) }} \ {{ docker.cleanup() }} @@ -53,7 +47,6 @@ RUN /usr/local/bin/yum-install \ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -65,8 +58,6 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ {{ provision.runRoleInline('base-app', role) }} \ {{ docker.cleanup() }} @@ -76,7 +67,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -88,8 +78,6 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && /usr/local/bin/generate-locales \ {{ provision.runRoleInline('base-app', role) }} \ {{ docker.cleanup() }} @@ -99,7 +87,6 @@ RUN /usr/local/bin/apt-install \ # Install services RUN /usr/local/bin/apt-install \ # Install common tools - sudo \ zip \ unzip \ bzip2 \ @@ -111,8 +98,6 @@ RUN /usr/local/bin/apt-install \ openssh-client \ rsync \ git \ - nano \ - vim \ && mkdir -p /var/lib/syslog-ng/ \ && /usr/local/bin/generate-locales \ {{ provision.runRoleInline('base-app', role) }} \ diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index ae79bf6d8..3177fa577 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -4,8 +4,6 @@ {% macro alpine() -%} # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ # Add community && echo http://dl-4.alpinelinux.org/alpine/v3.5/community/ >> /etc/apk/repositories \ # System update @@ -42,8 +40,6 @@ RUN set -x \ {% macro centos() -%} # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ # System update && /usr/local/bin/yum-upgrade \ && /usr/local/bin/yum-install \ @@ -70,12 +66,10 @@ RUN set -x \ {% macro debian(distribution) -%} # Init bootstrap RUN set -x \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(cat /etc/dockerimage_lsb_codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -84,9 +78,6 @@ RUN set -x \ apt-transport-https \ ca-certificates \ locales \ - # Generate base locale - && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ - && locale-gen \ # Install gosu && GOSU_VERSION=1.10 \ && /usr/local/bin/apt-install wget gnupg dirmngr \ @@ -114,10 +105,6 @@ RUN set -x \ && echo "deb http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && echo "deb-src http://archive.ubuntu.com/ubuntu/ precise multiverse" >> /etc/apt/sources.list \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff @@ -149,10 +136,6 @@ RUN set -x \ # Init bootstrap RUN set -x \ && apt-update \ - # Fix root terminal - && echo "export TERM=xterm" >> /root/.bashrc \ - # Generate base locale - && locale-gen en_US.UTF-8 \ # System update && /usr/local/bin/apt-upgrade \ # Install base stuff diff --git a/template/Dockerfile/images/hhvm.jinja2 b/template/Dockerfile/images/hhvm.jinja2 index 38eac92d1..e55428550 100644 --- a/template/Dockerfile/images/hhvm.jinja2 +++ b/template/Dockerfile/images/hhvm.jinja2 @@ -5,7 +5,7 @@ # Install hhvm environment RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 \ - && echo "deb http://dl.hhvm.com/ubuntu $(cat /etc/dockerimage_lsb_codename) main" >> /etc/apt/sources.list \ + && echo "deb http://dl.hhvm.com/ubuntu $(docker-image-info dist-codename) main" >> /etc/apt/sources.list \ && /usr/local/bin/apt-install \ hhvm \ imagemagick \ diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index aafb72a84..9b43a7229 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -10,6 +10,9 @@ RUN /usr/local/bin/apk-install \ graphviz \ # Install php development stuff php5-xdebug \ + # Tools + nano \ + vim \ {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} @@ -26,6 +29,9 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} @@ -40,6 +46,9 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y php56w-pecl-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} @@ -56,6 +65,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} @@ -73,6 +85,9 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \ php5-xdebug \ blackfire-php \ blackfire-agent \ + # Tools + nano \ + vim \ {{ services.phpDev() }} \ {{ provision.runRoleInline('dev', 'php-dev', role) }} \ {{ docker.cleanup() }} diff --git a/template/Dockerfile/images/postfix.jinja2 b/template/Dockerfile/images/postfix.jinja2 index e5aa384f8..f57b8a570 100644 --- a/template/Dockerfile/images/postfix.jinja2 +++ b/template/Dockerfile/images/postfix.jinja2 @@ -2,7 +2,7 @@ {% import 'Dockerfile/provision.jinja2' as provision %} {% macro ubuntu(role='') -%} -RUN /opt/docker/bin/control.sh service.enable postfix \ +RUN /opt/docker/bin/control.sh service.enable postfix syslog \ {{ provision.runRoleInline('postfix', role) }} \ {{ docker.cleanup() }} {%- endmacro %} diff --git a/template/Dockerfile/images/samson-deployment.jinja2 b/template/Dockerfile/images/samson-deployment.jinja2 index 87a4e8ade..52cb987f0 100644 --- a/template/Dockerfile/images/samson-deployment.jinja2 +++ b/template/Dockerfile/images/samson-deployment.jinja2 @@ -9,7 +9,7 @@ ENV SQLITE_CLEANUP_DAYS=0 # NGINX reverse proxy RUN export DEBIAN_FRONTEND=noninteractive && set -x \ && echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list \ - && curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add - \ + && curl -fsSL https://yum.dockerproject.org/gpg | apt-key add - \ && /usr/local/bin/apt-install \ # Install nginx nginx \ diff --git a/template/Dockerfile/services.jinja2 b/template/Dockerfile/services.jinja2 index cdf08f4f2..ddb956683 100644 --- a/template/Dockerfile/services.jinja2 +++ b/template/Dockerfile/services.jinja2 @@ -1,12 +1,11 @@ {% macro php() -%} # Enable php services - && docker-service-enable cron + && docker-service-enable syslog cron {%- endmacro %} {% macro phpDev() -%} # Enable php development services - && docker-service-enable ssh \ - && docker-service-enable postfix + && docker-service-enable syslog ssh postfix {%- endmacro %} diff --git a/tests/serverspec/Gemfile.lock b/tests/serverspec/Gemfile.lock index 6ae9d55bf..ee81cb515 100644 --- a/tests/serverspec/Gemfile.lock +++ b/tests/serverspec/Gemfile.lock @@ -2,15 +2,15 @@ GEM remote: https://rubygems.org/ specs: diff-lcs (1.3) - docker-api (1.33.2) + docker-api (1.33.4) excon (>= 0.38.0) json - excon (0.54.0) - json (2.0.3) + excon (0.55.0) + json (2.0.4) multi_json (1.12.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-telnet (0.1.1) rake (12.0.0) rspec (3.5.0) @@ -37,7 +37,7 @@ GEM rspec-its specinfra (~> 2.53) sfl (2.3) - specinfra (2.66.8) + specinfra (2.67.8) net-scp net-ssh (>= 2.7, < 5.0) net-telnet diff --git a/tests/serverspec/spec/collection/base.rb b/tests/serverspec/spec/collection/base.rb index c7fa05296..611d3261b 100644 --- a/tests/serverspec/spec/collection/base.rb +++ b/tests/serverspec/spec/collection/base.rb @@ -2,7 +2,6 @@ include_examples 'base::layout' include_examples 'base::packages' include_examples 'base::supervisor' - include_examples 'base::syslog-ng' include_examples 'base::toolchain' include_examples 'ansible::toolchain' end diff --git a/tests/serverspec/spec/shared/base/layout.rb b/tests/serverspec/spec/shared/base/layout.rb index d73bb114e..901531d36 100644 --- a/tests/serverspec/spec/shared/base/layout.rb +++ b/tests/serverspec/spec/shared/base/layout.rb @@ -51,7 +51,7 @@ "/opt/docker/etc/supervisor.conf", "/opt/docker/etc/logrotate.d/syslog-ng", "/opt/docker/etc/supervisor.d/cron.conf", - "/opt/docker/etc/supervisor.d/syslog-ng.conf", + "/opt/docker/etc/supervisor.d/syslog.conf", "/opt/docker/etc/syslog-ng/syslog-ng.conf", "/opt/docker/etc/supervisor.conf", "/opt/docker/etc/logrotate.d/syslog-ng", @@ -89,8 +89,6 @@ "/opt/docker/bin/config.sh", "/opt/docker/bin/control.sh", "/opt/docker/bin/entrypoint.sh", - "/opt/docker/bin/logwatch.sh", - "/opt/docker/bin/provision.sh", "/opt/docker/bin/service.d/syslog-ng.sh", "/opt/docker/bin/service.d/supervisor.sh", "/opt/docker/bin/entrypoint.d/cli.sh", @@ -101,6 +99,7 @@ "/usr/local/bin/service", "/usr/local/bin/docker-service-enable", "/usr/local/bin/docker-service-disable", + "/usr/local/bin/docker-provision", ].each do |file| describe file("#{file}") do # Type check diff --git a/tests/serverspec/spec/shared/bootstrap/distribution.rb b/tests/serverspec/spec/shared/bootstrap/distribution.rb index 951508015..ab627b0cd 100644 --- a/tests/serverspec/spec/shared/bootstrap/distribution.rb +++ b/tests/serverspec/spec/shared/bootstrap/distribution.rb @@ -4,6 +4,24 @@ # CentOS ######################### + describe command('docker-image-info family'), :if => os[:family] == 'redhat' do + its(:stdout) { should contain("RedHat") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info dist'), :if => os[:family] == 'redhat' do + its(:stdout) { should contain("CentOS") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info dist-version'), :if => os[:family] == 'redhat' do + its(:stdout) { should contain(os[:version]) } + + its(:exit_status) { should eq 0 } + end + describe command('cat /etc/redhat-release'), :if => os[:family] == 'redhat' do its(:stdout) { should contain('CentOS') } its(:stdout) { should contain('Linux release ' + os[:version] + '.') } @@ -15,14 +33,32 @@ # Ubuntu ######################### - describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'ubuntu' do + describe command('docker-image-info family'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain("Debian") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info dist'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain("Ubuntu") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info lsb'), :if => os[:family] == 'ubuntu' do its(:stdout) { should contain("Distributor ID:\tUbuntu") } its(:exit_status) { should eq 0 } end - describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do - its(:stdout) { should contain("Release:\t" + os[:version]) } + describe command('docker-image-info dist-version'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain(os[:version]) } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info lsb'), :if => os[:family] == 'ubuntu' do + its(:stdout) { should contain("Release:\t" + os[:version] + '.') } its(:exit_status) { should eq 0 } end @@ -31,14 +67,31 @@ # Debian ######################### - describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + describe command('docker-image-info family'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Debian") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info dist'), :if => os[:family] == 'debian' do + its(:stdout) { should contain("Debian") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info lsb'), :if => os[:family] == 'debian' do its(:stdout) { should contain("Distributor ID:\tDebian") } its(:exit_status) { should eq 0 } end + describe command('docker-image-info dist-version'), :if => os[:family] == 'debian' do + its(:stdout) { should contain(os[:version]) } + + its(:exit_status) { should eq 0 } + end - describe command('cat /etc/dockerimage_lsb'), :if => os[:family] == 'debian' do + describe command('docker-image-info lsb'), :if => os[:family] == 'debian' do its(:stdout) { should contain("Release:\t" + os[:version] + '.') } its(:exit_status) { should eq 0 } @@ -48,6 +101,25 @@ # Alpine ######################### + describe command('docker-image-info family'), :if => os[:family] == 'alpine' do + its(:stdout) { should contain("Alpine") } + + its(:exit_status) { should eq 0 } + end + + + describe command('docker-image-info dist'), :if => os[:family] == 'alpine' do + its(:stdout) { should contain("Alpine") } + + its(:exit_status) { should eq 0 } + end + + describe command('docker-image-info dist-version'), :if => os[:family] == 'alpine' do + its(:stdout) { should contain(os[:version]) } + + its(:exit_status) { should eq 0 } + end + describe command('sed -e "s/^/Release: /" /etc/alpine-release'), :if => os[:family] == 'alpine' do its(:stdout) { should contain('Release: ' + os[:version] + '.') } From 76ceb3ca086e9c5b33a4a5953b50bdbbb2c590bc Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 15 Apr 2017 13:18:58 +0200 Subject: [PATCH 57/58] Add newaliases before postfix start --- docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ .../latest/conf/bin/service.d/postfix.d/10-init.sh | 3 +++ provisioning/base/general/bin/service.d/postfix.d/10-init.sh | 3 +++ 16 files changed, 48 insertions(+) diff --git a/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases 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 7a604874f..14c14e7bc 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 @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases diff --git a/provisioning/base/general/bin/service.d/postfix.d/10-init.sh b/provisioning/base/general/bin/service.d/postfix.d/10-init.sh index 7a604874f..14c14e7bc 100644 --- a/provisioning/base/general/bin/service.d/postfix.d/10-init.sh +++ b/provisioning/base/general/bin/service.d/postfix.d/10-init.sh @@ -22,3 +22,6 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then sed -i '/mynetworks[ ]* =/c\' main.cf echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf fi + +# generate aliases db +newaliases From 39a27c18378b7ffbf4194c1639156b7036147ba3 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Sat, 15 Apr 2017 13:46:33 +0200 Subject: [PATCH 58/58] Ignore error if newaliases fails --- docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh | 2 +- docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh | 2 +- .../latest/conf/bin/service.d/postfix.d/10-init.sh | 2 +- provisioning/base/general/bin/service.d/postfix.d/10-init.sh | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh +++ b/docker/php-official/7.1/conf/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : 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 14c14e7bc..cfd876955 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 @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || : diff --git a/provisioning/base/general/bin/service.d/postfix.d/10-init.sh b/provisioning/base/general/bin/service.d/postfix.d/10-init.sh index 14c14e7bc..cfd876955 100644 --- a/provisioning/base/general/bin/service.d/postfix.d/10-init.sh +++ b/provisioning/base/general/bin/service.d/postfix.d/10-init.sh @@ -24,4 +24,4 @@ if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; then fi # generate aliases db -newaliases +newaliases || :