Merge branch 'release/0.53.0'

Author: mblaschke

CHANGELOG.md

@@ -8,8 +8,9 @@ DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST`
 list:
 	sh -c "echo; $(MAKE) -p no_targets__ | awk -F':' '/^[a-zA-Z0-9][^\$$#\\t=]*:([^=]|$$)/ {split(\$$1,A,/ /);for(i in A)print A[i]}' | grep -v '__\$$' | grep -v 'Makefile'| sort"
 
-all:       provision bootstrap base web php php-dev hhvm service misc applications
-build:     all
+full:      provision build
+all:       build
+build:     bootstrap base web php php-dev hhvm service misc applications
 
 bootstrap: webdevops/bootstrap webdevops/ansible
 base:      webdevops/base webdevops/base-app webdevops/storage
@@ -19,7 +20,7 @@ php:       webdevops/php webdevops/php-apache webdevops/php-nginx
 php-dev:   webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev
 hhvm:      webdevops/hhvm webdevops/hhvm-apache webdevops/hhvm-nginx
 
-web:       webdevops/apache webdevops/nginx webdevops/varnish
+web:       webdevops/apache webdevops/apache-dev webdevops/nginx webdevops/nginx-dev webdevops/varnish
 
 applications: webdevops/typo3 webdevops/piwik
 
@@ -99,9 +100,15 @@ webdevops/php-dev:
 webdevops/apache:
 	bash bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}"
 
+webdevops/apache-dev:
+	bash bin/build.sh apache-dev "${DOCKER_REPOSITORY}/apache-dev" "${DOCKER_TAG_LATEST}"
+
 webdevops/nginx:
 	bash bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}"
 
+webdevops/nginx-dev:
+	bash bin/build.sh nginx-dev "${DOCKER_REPOSITORY}/nginx-dev" "${DOCKER_TAG_LATEST}"
+
 webdevops/php-apache:
 	bash bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}"
 

Makefile

@@ -7,7 +7,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 apk update
 
 # Install packages
-apk add --upgrade --force $*
+apk add --upgrade $*
 
 # Clear files (reduce snapshot size)
 rm -rf var/cache/apk/*

README.md

@@ -254,6 +254,13 @@ function header() {
     deployConfiguration apache/alpine   apache  'alpine-*'
 }
 
+## Build apache-dev
+[[ $(checkBuildTarget apache-dev) ]] && {
+    header "apache-dev"
+    clearConfiguration  apache-dev '*'
+    deployConfiguration apache-dev/general  apache-dev  '*'
+}
+
 ## Build nginx
 [[ $(checkBuildTarget nginx) ]] && {
     header "nginx"
@@ -263,6 +270,13 @@ function header() {
     deployConfiguration nginx/alpine   nginx  'alpine-*'
 }
 
+## Build nginx-dev
+[[ $(checkBuildTarget nginx) ]] && {
+    header "nginx-dev"
+    clearConfiguration  nginx-dev '*'
+    deployConfiguration nginx-dev/general  nginx-dev  '*'
+}
+
 ## Build hhvm
 [[ $(checkBuildTarget hhvm) ]] && {
     header "hhvm"
@@ -338,6 +352,7 @@ function header() {
     deployConfiguration apache/alpine       php-apache-dev  'alpine-*'
     deployConfiguration php-apache/general  php-apache-dev  '*'
     deployConfiguration php-dev/general     php-apache-dev  '*'
+    deployConfiguration apache-dev/general  php-apache-dev  '*'
 }
 
 ## Build php-nginx-dev
@@ -349,6 +364,7 @@ function header() {
     deployConfiguration nginx/alpine       php-nginx-dev  'alpine-*'
     deployConfiguration php-nginx/general  php-nginx-dev  '*'
     deployConfiguration php-dev/general    php-nginx-dev  '*'
+    deployConfiguration nginx-dev/general  php-nginx-dev '*'
 }
 
 ## Build postfix

baselayout/usr/local/bin/apk-install

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

bin/provision.sh

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

docker/ansible/alpine-3/Dockerfile

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

docker/ansible/centos-7/Dockerfile

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

docker/ansible/debian-7/Dockerfile

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