Skip to content

Commit

Permalink
Merge branch 'release/1.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Jan 19, 2017
2 parents 7537b0b + c86b5d5 commit 0652cff
Show file tree
Hide file tree
Showing 253 changed files with 706 additions and 229 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).

## [1.2.4] - 2017-01-20
- Enable sshd for php-dev images
- Set root and application password of php-dev images to "dev"
- Fixed syslog-ng error message about log file destination (use pipe instead of file)
- Fixed test of debian-9 (distribution version is now "9", was "testing" before; upstream)

## [1.2.3] - 2017-01-10
- Removed default nginx vhost configuration (configuration collision) for alpine

Expand Down
2 changes: 1 addition & 1 deletion conf/console.yml
Expand Up @@ -76,7 +76,7 @@ dockerTest:
PHP_XDEBUG: '0'
':debian-9':
OS_FAMILY: 'debian'
OS_VERSION: 'testing'
OS_VERSION: '9'
':centos-7':
OS_FAMILY: 'redhat'
OS_VERSION: '7'
Expand Down
1 change: 1 addition & 0 deletions conf/provision.yml
Expand Up @@ -63,6 +63,7 @@ provision:
php-dev:
configuration:
php-dev/general : '*'
development/general: '*'
php-apache-dev:
configuration:
apache/general : '*'
Expand Down
2 changes: 1 addition & 1 deletion docker/ansible/alpine-3/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/centos-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/debian-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/debian-8/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/debian-9/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-12.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-14.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.10/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-16.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4
2 changes: 1 addition & 1 deletion docker/apache-dev/alpine-3/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/alpine-3/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/centos-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-8/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-9/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

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
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base-app/alpine-3/conf/bin/service.d/ssh.d/10-init.sh
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/centos-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base-app/centos-7/conf/bin/service.d/ssh.d/10-init.sh
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/debian-7/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base-app/debian-7/conf/bin/service.d/ssh.d/10-init.sh
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/debian-8/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base-app/debian-8/conf/bin/service.d/ssh.d/10-init.sh
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/debian-9/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
3 changes: 2 additions & 1 deletion docker/base-app/debian-9/conf/bin/service.d/ssh.d/10-init.sh
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-12.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-14.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.10/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-16.04/Dockerfile
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=1.2.3
LABEL io.webdevops.version=1.2.4

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
@@ -1 +1,2 @@
# placeholder
# generate host keys
ssh-keygen -A

0 comments on commit 0652cff

Please sign in to comment.