diff --git a/CHANGELOG.md b/CHANGELOG.md index 0304db0e7..4d6339f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D ## [1.0.0] - upcoming +## [0.51.0] - 2016-06-16 +### Added +- Added php module apcu +- Added (disabled) php module blackfire to php-dev and inherit images +- Added apt-transport-https for debian family images +### Changed +- Added link from /etc/aliases to /etc/postfix/alises for alpine + ## [0.50.6] - 2016-06-14 ### Changed - Switch from dotdeb to sury and install libpcre3 from testing diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile index d4d88a29a..63518f784 100644 --- a/docker/ansible/alpine-3/Dockerfile +++ b/docker/ansible/alpine-3/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile index ba2997e45..e83b4fba6 100644 --- a/docker/ansible/centos-7/Dockerfile +++ b/docker/ansible/centos-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile index eec96f65d..17942a2d0 100644 --- a/docker/ansible/debian-7/Dockerfile +++ b/docker/ansible/debian-7/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile index b75b2bfc7..63e4b3678 100644 --- a/docker/ansible/debian-8/Dockerfile +++ b/docker/ansible/debian-8/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile index d1b2a0886..f9508be87 100644 --- a/docker/ansible/debian-9/Dockerfile +++ b/docker/ansible/debian-9/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile index 391129d5f..9c674eb32 100644 --- a/docker/ansible/ubuntu-12.04/Dockerfile +++ b/docker/ansible/ubuntu-12.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile index 5ba6ee46f..6b5488b28 100644 --- a/docker/ansible/ubuntu-14.04/Dockerfile +++ b/docker/ansible/ubuntu-14.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile index 72918f7cb..4628ee3d4 100644 --- a/docker/ansible/ubuntu-15.04/Dockerfile +++ b/docker/ansible/ubuntu-15.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile index a78ac3582..c27f331d9 100644 --- a/docker/ansible/ubuntu-15.10/Dockerfile +++ b/docker/ansible/ubuntu-15.10/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile index fa5d6b6b8..d77cfc5f8 100644 --- a/docker/ansible/ubuntu-16.04/Dockerfile +++ b/docker/ansible/ubuntu-16.04/Dockerfile @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile index d4ac82871..840746894 100644 --- a/docker/apache/alpine-3/Dockerfile +++ b/docker/apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile index 68005bac0..2aa69f245 100644 --- a/docker/apache/centos-7/Dockerfile +++ b/docker/apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile index d56dcdf93..de3e11cc6 100644 --- a/docker/apache/debian-7/Dockerfile +++ b/docker/apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile index 77a0c3637..703b00656 100644 --- a/docker/apache/debian-8/Dockerfile +++ b/docker/apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile index 90c250d5e..7a1759024 100644 --- a/docker/apache/debian-9/Dockerfile +++ b/docker/apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile index 21dec762b..b0b3ba68e 100644 --- a/docker/apache/ubuntu-12.04/Dockerfile +++ b/docker/apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile index b5f6682c3..9083a6eb3 100644 --- a/docker/apache/ubuntu-14.04/Dockerfile +++ b/docker/apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile index 270ac5ab2..cd97f7778 100644 --- a/docker/apache/ubuntu-15.04/Dockerfile +++ b/docker/apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile index f592b584e..0361e331c 100644 --- a/docker/apache/ubuntu-15.10/Dockerfile +++ b/docker/apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile index 83d8afeac..15e7efed7 100644 --- a/docker/apache/ubuntu-16.04/Dockerfile +++ b/docker/apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile index f7e3d2c57..f15dd0570 100644 --- a/docker/base-app/alpine-3/Dockerfile +++ b/docker/base-app/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile index 20fffb178..d6301413d 100644 --- a/docker/base-app/centos-7/Dockerfile +++ b/docker/base-app/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile index 6a9ed30c6..2f2ebd8b3 100644 --- a/docker/base-app/debian-7/Dockerfile +++ b/docker/base-app/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile index 02fea0723..4721a4187 100644 --- a/docker/base-app/debian-8/Dockerfile +++ b/docker/base-app/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile index 28f92d4f1..6cc819601 100644 --- a/docker/base-app/debian-9/Dockerfile +++ b/docker/base-app/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile index dace483a7..a46c959d7 100644 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ b/docker/base-app/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile index 6443d4717..dfc58f65d 100644 --- a/docker/base-app/ubuntu-14.04/Dockerfile +++ b/docker/base-app/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile index eea620b82..48d769636 100644 --- a/docker/base-app/ubuntu-15.04/Dockerfile +++ b/docker/base-app/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile index b12f3c46e..c1ee93769 100644 --- a/docker/base-app/ubuntu-15.10/Dockerfile +++ b/docker/base-app/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile index 6d6efadea..3e0bc4ef0 100644 --- a/docker/base-app/ubuntu-16.04/Dockerfile +++ b/docker/base-app/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV APPLICATION_USER application ENV APPLICATION_GROUP application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile index 9bc153265..666e77574 100644 --- a/docker/base/alpine-3/Dockerfile +++ b/docker/base/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile index ed8fade6e..1d5c5de76 100644 --- a/docker/base/centos-7/Dockerfile +++ b/docker/base/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile index 329255a02..ea4cf575b 100644 --- a/docker/base/debian-7/Dockerfile +++ b/docker/base/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile index 98f23afc9..e2cc1d4c8 100644 --- a/docker/base/debian-8/Dockerfile +++ b/docker/base/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile index 58c6c7720..2a1c541e9 100644 --- a/docker/base/debian-9/Dockerfile +++ b/docker/base/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile index f175d1fa9..ce217f108 100644 --- a/docker/base/ubuntu-12.04/Dockerfile +++ b/docker/base/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile index ca70851ea..621263c56 100644 --- a/docker/base/ubuntu-14.04/Dockerfile +++ b/docker/base/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile index 58062dc43..81d37db3e 100644 --- a/docker/base/ubuntu-15.04/Dockerfile +++ b/docker/base/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile index 261d57284..8df2be64a 100644 --- a/docker/base/ubuntu-15.10/Dockerfile +++ b/docker/base/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile index f3c8d0fba..b3efbfa8c 100644 --- a/docker/base/ubuntu-16.04/Dockerfile +++ b/docker/base/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV DOCKER_CONF_HOME /opt/docker/ diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile index 7f2233257..2140681e5 100644 --- a/docker/bootstrap/alpine-3/Dockerfile +++ b/docker/bootstrap/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile index 00f872c4a..b16a04587 100644 --- a/docker/bootstrap/centos-7/Dockerfile +++ b/docker/bootstrap/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM centos:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile index d7fd78110..fa07b3ce7 100644 --- a/docker/bootstrap/debian-7/Dockerfile +++ b/docker/bootstrap/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM debian:7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ lsb-release \ ca-certificates \ locales \ + apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile index 86eff63d6..520d46f4b 100644 --- a/docker/bootstrap/debian-8/Dockerfile +++ b/docker/bootstrap/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM debian:8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ lsb-release \ ca-certificates \ locales \ + apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile index 33ffad3b8..dde4cd1e2 100644 --- a/docker/bootstrap/debian-9/Dockerfile +++ b/docker/bootstrap/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM debian:stretch MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ lsb-release \ ca-certificates \ locales \ + apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile index 0bd51cd31..e5ded4868 100644 --- a/docker/bootstrap/ubuntu-12.04/Dockerfile +++ b/docker/bootstrap/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libffi-dev \ libssl-dev \ build-essential \ + apt-transport-https \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile index 66d1783de..21c1ef4f1 100644 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ b/docker/bootstrap/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ software-properties-common \ lsb-release \ ca-certificates \ + apt-transport-https \ && apt-add-repository multiverse \ # Install ansible && /usr/local/bin/apt-install \ diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile index 037dfd42f..0894c317e 100644 --- a/docker/bootstrap/ubuntu-15.04/Dockerfile +++ b/docker/bootstrap/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ software-properties-common \ lsb-release \ ca-certificates \ + apt-transport-https \ && apt-add-repository multiverse \ # Install ansible && /usr/local/bin/apt-install \ diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile index 9bcc355d7..155ccbbd6 100644 --- a/docker/bootstrap/ubuntu-15.10/Dockerfile +++ b/docker/bootstrap/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ software-properties-common \ lsb-release \ ca-certificates \ + apt-transport-https \ && apt-add-repository multiverse \ # Install ansible && /usr/local/bin/apt-install \ diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile index ea3b7d969..7695419f5 100644 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile +++ b/docker/bootstrap/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 # Ensure UTF-8 ENV LANG en_US.UTF-8 @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ software-properties-common \ lsb-release \ ca-certificates \ + apt-transport-https \ && apt-add-repository multiverse \ # Install ansible && /usr/local/bin/apt-install \ diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile index 6f9d94efe..65f4f6ac5 100644 --- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile index 917fe0287..e141fa7d6 100644 --- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile index dc5cbc2a1..80ada07af 100644 --- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile index 661ffb5e1..c54f1009e 100644 --- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile +++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile index f5ccb5c5d..7c9cd8770 100644 --- a/docker/hhvm/ubuntu-14.04/Dockerfile +++ b/docker/hhvm/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile index e10272194..5b53845e1 100644 --- a/docker/hhvm/ubuntu-16.04/Dockerfile +++ b/docker/hhvm/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile index ef68aef5a..1a4d1658d 100644 --- a/docker/mail-sandbox/latest/Dockerfile +++ b/docker/mail-sandbox/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/postfix:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV MAILBOX_USERNAME "sandbox" ENV MAILBOX_PASSWORD "mail" diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile index b0d45ba5c..c5b247eb6 100644 --- a/docker/nginx/alpine-3/Dockerfile +++ b/docker/nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile index 8ed13da3c..aa039154f 100644 --- a/docker/nginx/centos-7/Dockerfile +++ b/docker/nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile index fd15fab45..ecbd18772 100644 --- a/docker/nginx/debian-7/Dockerfile +++ b/docker/nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile index 760c14499..ff643aea5 100644 --- a/docker/nginx/debian-8/Dockerfile +++ b/docker/nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile index 911e0648e..e3b0ea5bf 100644 --- a/docker/nginx/debian-9/Dockerfile +++ b/docker/nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile index 2cac2f6e7..a22a13c6b 100644 --- a/docker/nginx/ubuntu-12.04/Dockerfile +++ b/docker/nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile index ecca674e9..238deb1b8 100644 --- a/docker/nginx/ubuntu-14.04/Dockerfile +++ b/docker/nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile index da261bc68..fba958556 100644 --- a/docker/nginx/ubuntu-15.04/Dockerfile +++ b/docker/nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile index 566e5e21b..10425ce9e 100644 --- a/docker/nginx/ubuntu-15.10/Dockerfile +++ b/docker/nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile index db2f6c5a0..0a9ec76ab 100644 --- a/docker/nginx/ubuntu-16.04/Dockerfile +++ b/docker/nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile index 0ec43e20f..56a3ffd71 100644 --- a/docker/php-apache-dev/alpine-3-php7/Dockerfile +++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile index 2e2315dbd..705f762ef 100644 --- a/docker/php-apache-dev/alpine-3/Dockerfile +++ b/docker/php-apache-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile index 8cd8705f0..74a97845d 100644 --- a/docker/php-apache-dev/centos-7/Dockerfile +++ b/docker/php-apache-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/centos-7/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile index 4de9c3521..a43ca037d 100644 --- a/docker/php-apache-dev/debian-7/Dockerfile +++ b/docker/php-apache-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile index cf71e9928..bd15e8a0e 100644 --- a/docker/php-apache-dev/debian-8-php7/Dockerfile +++ b/docker/php-apache-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile index ae7e79a98..4b41471fd 100644 --- a/docker/php-apache-dev/debian-8/Dockerfile +++ b/docker/php-apache-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile index e4ac0911a..3583b51a5 100644 --- a/docker/php-apache-dev/debian-9/Dockerfile +++ b/docker/php-apache-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile index 4c030e464..ec7357fa4 100644 --- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile index f1c972e51..2f685bcb9 100644 --- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile index 9ea7d833d..7dc94222d 100644 --- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile index c48e01053..de6497332 100644 --- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile index 87d5c9d51..805ec3a39 100644 --- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-apache-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile index 7f01bdef9..7bc44ae7e 100644 --- a/docker/php-apache/alpine-3-php7/Dockerfile +++ b/docker/php-apache/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile index 2ce1ad461..14a941eb5 100644 --- a/docker/php-apache/alpine-3/Dockerfile +++ b/docker/php-apache/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile index 917c92498..f07f0304f 100644 --- a/docker/php-apache/centos-7/Dockerfile +++ b/docker/php-apache/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile index 82a71cb06..3edb34d3c 100644 --- a/docker/php-apache/debian-7/Dockerfile +++ b/docker/php-apache/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile index d59fd5e6a..2284ac92c 100644 --- a/docker/php-apache/debian-8-php7/Dockerfile +++ b/docker/php-apache/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile index be61d144f..14d84f210 100644 --- a/docker/php-apache/debian-8/Dockerfile +++ b/docker/php-apache/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile index 84b776b50..1fcb2298a 100644 --- a/docker/php-apache/debian-9/Dockerfile +++ b/docker/php-apache/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile index 5d7bf6181..dff0199aa 100644 --- a/docker/php-apache/ubuntu-12.04/Dockerfile +++ b/docker/php-apache/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile index 73811cef2..622e405fc 100644 --- a/docker/php-apache/ubuntu-14.04/Dockerfile +++ b/docker/php-apache/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile index d44e06923..ed896e4f3 100644 --- a/docker/php-apache/ubuntu-15.04/Dockerfile +++ b/docker/php-apache/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile index 61cabafab..c1e444d44 100644 --- a/docker/php-apache/ubuntu-15.10/Dockerfile +++ b/docker/php-apache/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile index 15ea1767b..3357a5ad8 100644 --- a/docker/php-apache/ubuntu-16.04/Dockerfile +++ b/docker/php-apache/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile index 93ac2ef28..321342a7b 100644 --- a/docker/php-dev/alpine-3-php7/Dockerfile +++ b/docker/php-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile index 17e197201..88214d5b0 100644 --- a/docker/php-dev/alpine-3/Dockerfile +++ b/docker/php-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile index 55a80a684..3f43e428d 100644 --- a/docker/php-dev/centos-7/Dockerfile +++ b/docker/php-dev/centos-7/Dockerfile @@ -8,16 +8,18 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/yum-install \ +RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ + && /usr/local/bin/yum-install \ # Install tools graphviz \ # Install php development stuff php-pecl-xdebug \ + blackfire-php \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/centos-7/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile index 86f4ed9a3..e6c090dea 100644 --- a/docker/php-dev/debian-7/Dockerfile +++ b/docker/php-dev/debian-7/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile index 829ddf178..9278f7e18 100644 --- a/docker/php-dev/debian-8-php7/Dockerfile +++ b/docker/php-dev/debian-8-php7/Dockerfile @@ -8,12 +8,14 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile index f918c0ac3..060795e22 100644 --- a/docker/php-dev/debian-8/Dockerfile +++ b/docker/php-dev/debian-8/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile index 390773f50..0b9eddf1e 100644 --- a/docker/php-dev/debian-9/Dockerfile +++ b/docker/php-dev/debian-9/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 php-xdebug \ + blackfire-php \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile index 8656b6acb..1c4b3a82f 100644 --- a/docker/php-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-dev/ubuntu-12.04/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile index 67336f714..a0b39d181 100644 --- a/docker/php-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-dev/ubuntu-14.04/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile index a21bc96f8..9fca920f1 100644 --- a/docker/php-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-dev/ubuntu-15.04/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile index e54a8db84..8bbce175d 100644 --- a/docker/php-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-dev/ubuntu-15.10/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile index d42342a0f..a1888407b 100644 --- a/docker/php-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-dev/ubuntu-16.04/Dockerfile @@ -8,16 +8,19 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ # Install development environment -RUN /usr/local/bin/apt-install \ +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 php-xdebug \ + blackfire-php \ && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \ && /opt/docker/bin/bootstrap.sh 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile index d6b12d81f..585d3eca8 100644 --- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile +++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile index c65a42cc5..38e42d68a 100644 --- a/docker/php-nginx-dev/alpine-3/Dockerfile +++ b/docker/php-nginx-dev/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile index 32818eaba..4e41c9248 100644 --- a/docker/php-nginx-dev/centos-7/Dockerfile +++ b/docker/php-nginx-dev/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/centos-7/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile index 3947875a9..e5fff1f0e 100644 --- a/docker/php-nginx-dev/debian-7/Dockerfile +++ b/docker/php-nginx-dev/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile index 504f66c23..36c0584fe 100644 --- a/docker/php-nginx-dev/debian-8-php7/Dockerfile +++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile index d49a1825a..f6a6328f4 100644 --- a/docker/php-nginx-dev/debian-8/Dockerfile +++ b/docker/php-nginx-dev/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile index d1b78bfcc..ec46fa9e6 100644 --- a/docker/php-nginx-dev/debian-9/Dockerfile +++ b/docker/php-nginx-dev/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile index f4ad7d159..8178a0222 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile index ae6661348..128162929 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile index 8db62bf77..54ec285e6 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile index f40afe41c..7ecd224e0 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile index 06a138cd1..d3cb2f895 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php 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 7293c52a3..d0fa4ded5 100644 --- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/docker/php-nginx-dev/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile index b51f3aea2..63e1731a8 100644 --- a/docker/php-nginx/alpine-3-php7/Dockerfile +++ b/docker/php-nginx/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile index d4de97502..c57af0722 100644 --- a/docker/php-nginx/alpine-3/Dockerfile +++ b/docker/php-nginx/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile index a2425bea6..a0be8fef7 100644 --- a/docker/php-nginx/centos-7/Dockerfile +++ b/docker/php-nginx/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile index f4f6c9183..dabe22f2a 100644 --- a/docker/php-nginx/debian-7/Dockerfile +++ b/docker/php-nginx/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile index 814ea3a02..090745c76 100644 --- a/docker/php-nginx/debian-8-php7/Dockerfile +++ b/docker/php-nginx/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile index 93b6d61b8..2a7a78ea1 100644 --- a/docker/php-nginx/debian-8/Dockerfile +++ b/docker/php-nginx/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile index a6253e830..c9a88d82d 100644 --- a/docker/php-nginx/debian-9/Dockerfile +++ b/docker/php-nginx/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile index 8af19352c..8498314d2 100644 --- a/docker/php-nginx/ubuntu-12.04/Dockerfile +++ b/docker/php-nginx/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile index 141edf3a4..9346c7f91 100644 --- a/docker/php-nginx/ubuntu-14.04/Dockerfile +++ b/docker/php-nginx/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile index 80fee06bf..2c394bbf7 100644 --- a/docker/php-nginx/ubuntu-15.04/Dockerfile +++ b/docker/php-nginx/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile index 889694e78..2a46591fa 100644 --- a/docker/php-nginx/ubuntu-15.10/Dockerfile +++ b/docker/php-nginx/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile index cd3b1f213..c28c22646 100644 --- a/docker/php-nginx/ubuntu-16.04/Dockerfile +++ b/docker/php-nginx/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile index 60d416252..d1a882852 100644 --- a/docker/php/alpine-3-php7/Dockerfile +++ b/docker/php/alpine-3-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -49,7 +49,7 @@ RUN /usr/local/bin/apk-install \ php7-xmlreader \ php7-exif \ php7-ftp \ - php7-gettext \ + php7-gemttext \ php7-iconv \ php7-zip \ php7-zlib \ @@ -69,6 +69,7 @@ RUN /usr/local/bin/apk-install \ php7-opcache \ php7-mbstring \ php7-iconv \ + php7-apcu \ && ln -s /usr/bin/php7 /usr/bin/php \ && ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm \ && pear channel-update pear.php.net \ diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile index 0af1dd38f..01ac1b93b 100644 --- a/docker/php/alpine-3/Dockerfile +++ b/docker/php/alpine-3/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -65,6 +65,7 @@ RUN /usr/local/bin/apk-install \ php-pear \ php-phar \ php-openssl \ + php-apcu \ && pear channel-update pear.php.net \ && pear upgrade-all \ && pear config-set auto_discover 1 \ diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile index d4bcdc286..83242debf 100644 --- a/docker/php/centos-7/Dockerfile +++ b/docker/php/centos-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -45,6 +45,7 @@ RUN /usr/local/bin/yum-install \ ImageMagick-devel \ ImageMagick-perl \ php-pear \ + php-pecl-apcu \ php-devel \ gcc \ php-pear \ diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile index 64dd72bfc..c67d663a3 100644 --- a/docker/php/debian-7/Dockerfile +++ b/docker/php/debian-7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile index 30a1d3ecf..dfcad653e 100644 --- a/docker/php/debian-8-php7/Dockerfile +++ b/docker/php/debian-8-php7/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -54,6 +54,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-soap \ php7.0-bcmath \ php7.0-mbstring \ + 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 diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile index 038c2f8a1..9407b61a9 100644 --- a/docker/php/debian-8/Dockerfile +++ b/docker/php/debian-8/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile index 2efeb551d..336e62118 100644 --- a/docker/php/debian-9/Dockerfile +++ b/docker/php/debian-9/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ php7.0-xmlrpc \ php7.0-xsl \ php7.0-bz2 \ + php-apcu \ php-redis \ php-memcache \ php-memcached \ diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile index 37682d631..7c076f24f 100644 --- a/docker/php/ubuntu-12.04/Dockerfile +++ b/docker/php/ubuntu-12.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile index 3e99601de..1b091c8e2 100644 --- a/docker/php/ubuntu-14.04/Dockerfile +++ b/docker/php/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile index a3117a61a..e75f7a626 100644 --- a/docker/php/ubuntu-15.04/Dockerfile +++ b/docker/php/ubuntu-15.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile index bec40053b..b03d8809a 100644 --- a/docker/php/ubuntu-15.10/Dockerfile +++ b/docker/php/ubuntu-15.10/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile index f9c4d69ab..fc24750f9 100644 --- a/docker/php/ubuntu-16.04/Dockerfile +++ b/docker/php/ubuntu-16.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app ENV WEB_DOCUMENT_INDEX index.php @@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \ php7.0-xmlrpc \ php7.0-xsl \ php7.0-bz2 \ + php-apcu \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile index f0a959a3c..f8f8beb30 100644 --- a/docker/piwik/ubuntu-14.04/Dockerfile +++ b/docker/piwik/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app/piwik/ ENV PIWIK_URL http://example.com/ diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile index 0041ec629..f613beea9 100644 --- a/docker/postfix/latest/Dockerfile +++ b/docker/postfix/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 COPY conf/ /opt/docker/ diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile index d88d8867b..1c68c7eee 100644 --- a/docker/samson-deployment/latest/Dockerfile +++ b/docker/samson-deployment/latest/Dockerfile @@ -8,7 +8,7 @@ FROM zendesk/samson:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ############################################################################### @@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ lsb-release \ ca-certificates \ locales \ + apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile index 1e5f6d87c..453c6e519 100644 --- a/docker/sphinx/latest/Dockerfile +++ b/docker/sphinx/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 RUN /usr/local/bin/apk-install \ # General sphinx diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile index 6095e7574..b2eccfe81 100644 --- a/docker/ssh/latest/Dockerfile +++ b/docker/ssh/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base-app:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 RUN /opt/docker/bin/control.sh service.enable ssh diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile index c2bb0bbe4..fdd6d2034 100644 --- a/docker/storage/latest/Dockerfile +++ b/docker/storage/latest/Dockerfile @@ -8,7 +8,7 @@ FROM busybox:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 RUN mkdir /storage/ \ && chmod 777 /storage/ diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile index cd48fd0ca..07e0cac3b 100644 --- a/docker/typo3/ubuntu-14.04/Dockerfile +++ b/docker/typo3/ubuntu-14.04/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV WEB_DOCUMENT_ROOT /app/web/ diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile index 4a800a423..f56ef67fd 100644 --- a/docker/varnish/latest/Dockerfile +++ b/docker/varnish/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3 MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV VARNISH_PORT 80 diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile index e710bbf74..9179a39cd 100644 --- a/docker/vsftp/latest/Dockerfile +++ b/docker/vsftp/latest/Dockerfile @@ -8,7 +8,7 @@ FROM webdevops/base:latest MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 ENV FTP_USER application ENV FTP_PASSWORD application 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 index 6b0ea47dc..4a31c334e 100644 --- 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 @@ -1,5 +1,13 @@ --- +- 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 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 7293c52a3..d0fa4ded5 100644 --- a/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap.yml @@ -2,5 +2,6 @@ - include: bootstrap/tools.yml - include: bootstrap/php-fpm.yml -- include: bootstrap/php-module.xdebug.yml - include: bootstrap/php-module.opcache.yml +- include: bootstrap/php-module.xdebug.yml +- include: bootstrap/php-module.blackfire.yml diff --git a/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 new file mode 100644 index 000000000..a465aef6b --- /dev/null +++ b/provisioning/php-dev/general/provision/roles/webdevops-php-dev/tasks/bootstrap/php-module.blackfire.yml @@ -0,0 +1,21 @@ +--- + +- name: Disable blackfire by default + replace: + dest: '{{ item }}' + regexp: '^[;\s]*((zend_)?(extension=))' + replace: ';\1' + ignore_errors: yes + with_items: + # RedHat + - "/etc/php.d/zz-blackfire.ini" + # Debian - PHP 5.x + - "/etc/php5/conf.d/90-blackfire.ini" + - "/etc/php5/conf.d/zz-blackfire.ini" + - "/etc/php5/cli/conf.d/90-blackfire.ini" + - "/etc/php5/cli/conf.d/zz-blackfire.ini" + - "/etc/php5/fpm/conf.d/90-blackfire.ini" + - "/etc/php5/fpm/conf.d/zz-blackfire.ini" + # Debian - PHP 7.x + - "/etc/php/7.0/cli/conf.d/90-blackfire.ini" + - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini" diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2 index 4c6400f10..b2a9987b6 100644 --- a/template/Dockerfile/docker.jinja2 +++ b/template/Dockerfile/docker.jinja2 @@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }} MAINTAINER info@webdevops.io LABEL vendor=WebDevOps.io LABEL io.webdevops.layout=7 -LABEL io.webdevops.version=0.50.6 +LABEL io.webdevops.version=0.51.0 {%- endmacro %} {%- macro add(source, target) -%} diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2 index e130984f4..6d1b610e7 100644 --- a/template/Dockerfile/images/bootstrap.jinja2 +++ b/template/Dockerfile/images/bootstrap.jinja2 @@ -76,6 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ lsb-release \ ca-certificates \ locales \ + apt-transport-https \ # Generate base locale && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ @@ -135,6 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libffi-dev \ libssl-dev \ build-essential \ + apt-transport-https \ && pip install --upgrade pip \ && hash -r \ && pip install ansible \ @@ -165,6 +167,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ software-properties-common \ lsb-release \ ca-certificates \ + apt-transport-https \ && apt-add-repository multiverse \ # Install ansible && /usr/local/bin/apt-install \ diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2 index 7c9fad8a7..11f399221 100644 --- a/template/Dockerfile/images/php5-dev.jinja2 +++ b/template/Dockerfile/images/php5-dev.jinja2 @@ -13,32 +13,40 @@ RUN /usr/local/bin/apk-install \ {% macro centos(role='') -%} # Install development environment -RUN /usr/local/bin/yum-install \ +RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ + && /usr/local/bin/yum-install \ # Install tools graphviz \ # Install php development stuff php-pecl-xdebug \ + blackfire-php \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} {% macro debian(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} {% macro ubuntu(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2 index 2dd09ce1f..8c5354191 100644 --- a/template/Dockerfile/images/php5.jinja2 +++ b/template/Dockerfile/images/php5.jinja2 @@ -50,6 +50,7 @@ RUN /usr/local/bin/apk-install \ php-pear \ php-phar \ php-openssl \ + php-apcu \ && pear channel-update pear.php.net \ && pear upgrade-all \ && pear config-set auto_discover 1 \ @@ -88,6 +89,7 @@ RUN /usr/local/bin/yum-install \ ImageMagick-devel \ ImageMagick-perl \ php-pear \ + php-pecl-apcu \ php-devel \ gcc \ php-pear \ @@ -158,6 +160,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ @@ -262,6 +265,7 @@ RUN /usr/local/bin/apt-install \ php5-memcached \ php5-imagick \ php5-redis \ + php5-apcu \ php-pear \ && pear channel-update pear.php.net \ && pear upgrade-all \ @@ -294,6 +298,7 @@ RUN /usr/local/bin/apt-install \ php5-ldap \ php5-memcache \ php5-imagick \ + php5-apcu \ && 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 \ diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2 index d5209caec..3069bb59d 100644 --- a/template/Dockerfile/images/php7-dev.jinja2 +++ b/template/Dockerfile/images/php7-dev.jinja2 @@ -13,38 +13,48 @@ RUN /usr/local/bin/apk-install \ {% macro centos(role='') -%} # Install development environment -RUN /usr/local/bin/yum-install \ +RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/yum.repos.d/blackfire.repo \ + && /usr/local/bin/yum-install \ # Install tools graphviz \ # Install php development stuff php7-xdebug \ + blackfire-php \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} {% macro debian(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 php-xdebug \ + blackfire-php \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} {% macro debianDotDeb(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 php7.0-xdebug \ + blackfire-php \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} {% macro debianSury(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 @@ -54,10 +64,13 @@ RUN /usr/local/bin/apt-install \ {% macro ubuntu(role='') -%} # Install development environment -RUN /usr/local/bin/apt-install \ +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 php-xdebug \ + blackfire-php \ {{ provision.runRoleInline('php-dev', role) }} {%- endmacro %} diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2 index 6435f24f7..8fb21b869 100644 --- a/template/Dockerfile/images/php7.jinja2 +++ b/template/Dockerfile/images/php7.jinja2 @@ -34,7 +34,7 @@ RUN /usr/local/bin/apk-install \ php7-xmlreader \ php7-exif \ php7-ftp \ - php7-gettext \ + php7-gemttext \ php7-iconv \ php7-zip \ php7-zlib \ @@ -54,6 +54,7 @@ RUN /usr/local/bin/apk-install \ php7-opcache \ php7-mbstring \ php7-iconv \ + php7-apcu \ && ln -s /usr/bin/php7 /usr/bin/php \ && ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm \ && pear channel-update pear.php.net \ @@ -89,6 +90,7 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou php7.0-bz2 \ php7.0-redis \ php7.0-memcached \ + php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} @@ -132,6 +134,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \ php7.0-soap \ php7.0-bcmath \ php7.0-mbstring \ + php-apcu \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ {{ provision.runRoleInline('php', role) }} {%- endmacro %} @@ -161,6 +164,7 @@ RUN /usr/local/bin/apt-install \ php7.0-xmlrpc \ php7.0-xsl \ php7.0-bz2 \ + php-apcu \ php-redis \ php-memcache \ php-memcached \ @@ -193,6 +197,7 @@ RUN /usr/local/bin/apt-install \ php7.0-xmlrpc \ php7.0-xsl \ php7.0-bz2 \ + php-apcu \ php-redis \ php-memcached \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \ diff --git a/test/spec/shared/php/modules.rb b/test/spec/shared/php/modules.rb index febaffb7e..d7bbfbc78 100644 --- a/test/spec/shared/php/modules.rb +++ b/test/spec/shared/php/modules.rb @@ -4,8 +4,6 @@ shared_examples 'php::modules' do describe command('php -m') do - its(:stdout) { should_not contain('apc') } - its(:stdout) { should contain('bcmath') } its(:stdout) { should contain('bz2') } its(:stdout) { should contain('calendar') } @@ -60,6 +58,13 @@ its(:stdout) { should contain('gd') } end + if !( + (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or + (os[:family] == 'debian' and os[:version] == '7' ) + ) + its(:stdout) { should contain('apcu') } + end + its(:exit_status) { should eq 0 } end end @@ -67,6 +72,7 @@ shared_examples 'php::modules::production' do describe command('php -m') do its(:stdout) { should_not contain('xdebug') } + its(:stdout) { should_not contain('blackfire') } its(:exit_status) { should eq 0 } end @@ -78,6 +84,9 @@ its(:stdout) { should contain('xdebug') } end + # disabled by default + its(:stdout) { should_not contain('blackfire') } + its(:exit_status) { should eq 0 } end end @@ -119,8 +128,6 @@ shared_examples 'php-fpm::modules' do describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do - its(:stdout) { should_not contain('apc') } - its(:stdout) { should contain('bcmath') } its(:stdout) { should contain('bz2') } its(:stdout) { should contain('calendar') } @@ -175,6 +182,13 @@ its(:stdout) { should contain('gd') } end + if !( + (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or + (os[:family] == 'debian' and os[:version] == '7' ) + ) + its(:stdout) { should contain('apcu') } + end + its(:exit_status) { should eq 0 } end end @@ -182,6 +196,7 @@ shared_examples 'php-fpm::modules::production' do describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do its(:stdout) { should_not contain('xdebug') } + its(:stdout) { should_not contain('blackfire') } its(:exit_status) { should eq 0 } end @@ -194,6 +209,9 @@ its(:stdout) { should contain('xdebug') } end + # disabled by default + its(:stdout) { should_not contain('blackfire') } + its(:exit_status) { should eq 0 } end end