Skip to content

Commit

Permalink
Merge branch 'release/0.55.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mblaschke
mblaschke committed Jul 30, 2016
2 parents 8bf470a + 4797b8d commit 9b50eaf
Show file tree
Hide file tree
Showing 180 changed files with 194 additions and 200 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D

## [1.0.0] - upcoming

## [0.55.3] - 2016-07-30
- Moved gpg to base

## [0.55.2] - 2016-07-30
- Add gpg for php-dev (required by blackfire installation)

Expand Down
2 changes: 1 addition & 1 deletion docker/ansible/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3
2 changes: 1 addition & 1 deletion docker/apache-dev/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-dev/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV DOCKER_CONF_HOME /opt/docker/

Expand All @@ -23,6 +23,7 @@ RUN chmod +x /opt/docker/bin/* \
wget \
curl \
sed \
gnupg \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
&& /opt/docker/bin/bootstrap.sh

Expand Down
3 changes: 2 additions & 1 deletion docker/base/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV DOCKER_CONF_HOME /opt/docker/

Expand All @@ -24,6 +24,7 @@ RUN chmod +x /opt/docker/bin/* \
wget \
curl \
net-tools \
gnupg2 \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
&& /opt/docker/bin/bootstrap.sh

Expand Down
3 changes: 2 additions & 1 deletion docker/base/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER info@webdevops.io
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=8
LABEL io.webdevops.version=0.55.2
LABEL io.webdevops.version=0.55.3

ENV DOCKER_CONF_HOME /opt/docker/

Expand All @@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
wget \
curl \
net-tools \
gnupg \
&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
&& /opt/docker/bin/bootstrap.sh

Expand Down

0 comments on commit 9b50eaf

Please sign in to comment.