Merge branch 'release/0.52.0'

Author: mblaschke

CHANGELOG.md

@@ -4,101 +4,89 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.52.0] - 2016-06-20
+- Added tag centos-7-php56 for php images
+- Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables
+- Added pysed
+- Added PHP_DEBUGGER environment variable for php*dev images
+- Fix warnings in vsftp image
+- Fix package names in alpine (broken build)
+- Updated documentation and tests
+
 ## [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
 
 ## [0.50.5] - 2016-06-10
-### Added
 - Added Magallanes deployer for samson-deployment
-### Changed
 - Improved documentation
 
 ## [0.50.4] - 2016-06-06
-### Removed
 - Removed superfluous environment variables for PHP inside nginx
-### Changed
 - Added more layout sections to documentation
 
 
 ## [0.50.3] - 2016-06-06
-### Added
 - Added `WEB_PHP_SOCKET` for apache and nginx images, this env variable specifies the host where php-fpm is listening
 - Added `WEB_NO_CACHE_PATTERN` to apache and nginx images (regexp of files which should not be cached by browser) for php*-dev images
 - Added `make baselayout` for building baselayout.tar (not always needed)
 - Added php-fpm clear_env workaround for php-fpm versions which doesn't support it
-### Changed
 - Set PHP-FPM ports to public on php*-dev images
 - Set mail-sandbox to latest tag (using Ubuntu 16.04)
 - Moved environment macros of jinja2 templates to environment.jinja2
 - Updated documentation
 
 ## [0.50.2] - 2016-05-27
-### Changed
 - Fix /opt/docker/bin/service.d/php-fpm.sh using php.d instead of php-fpm.d
 - Restructured documentation, Added customization section
 
 ## [0.50.1] - 2016-05-24
-### Changed
 - Fixed required root rights for entrypoint, provisioning is now only running when entrypoint is entered with root
 - Modularized service.d scripts (will include servide.d/$serv.d/*.sh before execution)
 
 ## [0.50.0] - 2016-05-23
-### Changed
 - Improve image sizes (backported to 0.23.0 due to build issues)
 - Improved provisioning system with new python wrapper
 - Modularized apache and nginx configuration
 - Dockerfile are now generated via jinja2 files
 - webdevops/storage is now using busybox
 - Latest tag is now ubuntu 16.04
 - Set clear_env to no for php-fpm (if possible)
-### Added
 - Added ubuntu 16.04 images (eg. php, hhvm)
 - Added webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev (xdebug and disabled caching for webserver) 
 - Added webdevops/varnish
 - Added mod_expire for webdevops/apache
 
 ## [0.23.0] - 2016-04-03
-### Changed
 - Enabled alpine-3-php7 images
 - Fixed some smaller issues
 - Added TYPO3 packages to sphinx image
 - Fixed build system for new docker version (1.11.0)
 
 ## [0.22.0] - 2016-04-03
-### Changed
 - Introduced base-app for application images
 - Added alpine-3 images
 - Added sphinx image
 
 ## [0.21.6] - 2016-03-25
-### Changed
 - Refactored directory layout (container -> docker/, .bin -> bin, testsuite -> test/
 
 ## [0.21.5] - 2016-03-24
-### Added
 - Fixed permissions automatically for /tmp if mounted as volume
 - Added error checks for samson service script
 
 ## [0.21.0] - 2016-03-20
-### Changed
 - Improved entrypoint startup time
 - Removed entrypoint ansible provisioning if not needed
 - Added java-jre and latest npm for samson-deployment
 
 
 ## [0.20.0] - 2016-02-24
-### Added
 - Added sqlite to base images
-
-### Changed
 - Moved WEB_DOCUMENT_ROOT to /app (from /application/code) 
 - Improved samson-deployment

FIXME.md

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:alpine-3
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/alpine-3/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:centos-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/centos-7/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/debian-7/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-8
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/debian-8/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:debian-9
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/debian-9/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-12.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/ubuntu-12.04/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-14.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/ubuntu-14.04/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-15.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/ubuntu-15.04/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-15.10
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/ubuntu-15.10/Dockerfile

@@ -7,5 +7,5 @@ FROM webdevops/bootstrap:ubuntu-16.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0

docker/ansible/ubuntu-16.04/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/alpine-3/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:centos-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/centos-7/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:debian-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-7/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:debian-8
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-8/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:debian-9
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/debian-9/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-12.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-12.04/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-14.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-14.04/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-15.04/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-15.10
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-15.10/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:ubuntu-16.04
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

docker/apache/ubuntu-16.04/Dockerfile

@@ -7,8 +7,8 @@ FROM webdevops/base:alpine-3
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/alpine-3/Dockerfile

@@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc
 cp -f /etc/hosts       /var/spool/postfix/etc/hosts
 cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf
 cp -f /etc/services    /var/spool/postfix/etc/services
+
+if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else
+    echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf
+fi
+
+if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else
+    echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf
+fi

docker/base-app/alpine-3/conf/bin/service.d/postfix.d/10-init.sh

@@ -7,8 +7,8 @@ FROM webdevops/base:centos-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/centos-7/Dockerfile

@@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc
 cp -f /etc/hosts       /var/spool/postfix/etc/hosts
 cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf
 cp -f /etc/services    /var/spool/postfix/etc/services
+
+if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else
+    echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf
+fi
+
+if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else
+    echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf
+fi

docker/base-app/centos-7/conf/bin/service.d/postfix.d/10-init.sh

@@ -7,8 +7,8 @@ FROM webdevops/base:debian-7
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

docker/base-app/debian-7/Dockerfile

@@ -3,3 +3,11 @@ mkdir -p /var/spool/postfix/etc
 cp -f /etc/hosts       /var/spool/postfix/etc/hosts
 cp -f /etc/resolv.conf /var/spool/postfix/etc/resolv.conf
 cp -f /etc/services    /var/spool/postfix/etc/services
+
+if [[ -n "${POSTFIX_RELAYHOST+x}" ]]; else
+    echo "relayhost = $POSTFIX_RELAYHOST" >> /etc/postfix/main.cf
+fi
+
+if [[ -n "${POSTFIX_MYNETWORKS+x}" ]]; else
+    echo "mynetworks = $POSTFIX_MYNETWORKS" >> /etc/postfix/main.cf
+fi

docker/base-app/debian-7/conf/bin/service.d/postfix.d/10-init.sh

@@ -7,8 +7,8 @@ FROM webdevops/base:debian-8
 
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
-LABEL io.webdevops.layout=7
-LABEL io.webdevops.version=0.51.0
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application