Skip to content

Commit

Permalink
Merge branch 'release/0.51.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Jun 16, 2016
2 parents d1764fb + 980f3a4 commit d0be639
Show file tree
Hide file tree
Showing 242 changed files with 1,227 additions and 210 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/ansible/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=7
LABEL io.webdevops.version=0.50.6
LABEL io.webdevops.version=0.51.0
2 changes: 1 addition & 1 deletion docker/apache/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER [email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/alpine-3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-12.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-14.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER [email protected]
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit d0be639

Please sign in to comment.