Merge branch 'release/0.22.0'

Author: mblaschke

CHANGELOG.md

@@ -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).
 
+## [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/

FIXME.md

@@ -20,3 +20,6 @@ Mostly upstream issues (eg. missing or broken packages)
 
 ## Debian 9 (PHP 7)
 - Missing memcached
+
+## Alpine 3 (PHP5)
+- Missing mhash

Makefile

@@ -11,7 +11,7 @@ list:
 all:       bootstrap base web php hhvm service misc applications
 
 bootstrap: webdevops/bootstrap webdevops/ansible
-base:      webdevops/base webdevops/storage
+base:      webdevops/base webdevops/base-app webdevops/storage
 service:   webdevops/ssh webdevops/vsftp webdevops/postfix
 
 php:       webdevops/php webdevops/php-apache webdevops/php-nginx
@@ -21,7 +21,7 @@ web:       webdevops/apache webdevops/nginx
 
 applications: webdevops/typo3 webdevops/piwik
 
-misc:      webdevops/mail-sandbox
+misc:      webdevops/mail-sandbox webdevops/sphinx
 
 test:
 	cd "test/" && make all
@@ -44,6 +44,7 @@ dist-update:
 	docker pull debian:7
 	docker pull debian:8
 	docker pull debian:stretch
+	docker pull alpine:3.3
 
 rebuild:
 	# Rebuild all containers but use caching for duplicates
@@ -73,6 +74,9 @@ webdevops/ansible:
 webdevops/base:
 	bash bin/build.sh base "${DOCKER_REPOSITORY}/base" "${DOCKER_TAG_LATEST}"
 
+webdevops/base-app:
+	bash bin/build.sh base-app "${DOCKER_REPOSITORY}/base-app" "${DOCKER_TAG_LATEST}"
+
 webdevops/php:
 	bash bin/build.sh php "${DOCKER_REPOSITORY}/php" "${DOCKER_TAG_LATEST}"
 
@@ -120,3 +124,6 @@ webdevops/piwik:
 
 webdevops/samson-deployment:
 	bash bin/build.sh samson-deployment "${DOCKER_REPOSITORY}/samson-deployment" "${DOCKER_TAG_LATEST}"
+
+webdevops/sphinx:
+	bash bin/build.sh sphinx "${DOCKER_REPOSITORY}/sphinx" "${DOCKER_TAG_LATEST}"

bin/provision.sh

@@ -215,6 +215,14 @@ function header() {
     clearConfiguration  base  '*'
     deployConfiguration base/general        base  '*'
     deployConfiguration base/centos         base  'centos-*'
+    deployConfiguration base/alpine         base  'alpine-*'
+}
+
+## Build base-app
+[[ $(checkBuildTarget base-app) ]] && {
+    header "base-app"
+    clearConfiguration  base-app  '*'
+    deployConfiguration base-app/general        base-app  '*'
 }
 
 ## Build apache
@@ -223,6 +231,7 @@ function header() {
     clearConfiguration  apache '*'
     deployConfiguration apache/general  apache  '*'
     deployConfiguration apache/centos   apache  'centos-*'
+    deployConfiguration apache/alpine   apache  'alpine-*'
 }
 
 ## Build nginx
@@ -231,6 +240,7 @@ function header() {
     clearConfiguration  nginx '*'
     deployConfiguration nginx/general  nginx  '*'
     deployConfiguration nginx/centos   nginx  'centos-*'
+    deployConfiguration nginx/alpine   nginx  'alpine-*'
 }
 
 ## Build hhvm
@@ -263,6 +273,7 @@ function header() {
     clearConfiguration  php  '*'
     deployConfiguration php/general       php  '*'
     deployConfiguration php/ubuntu-12.04  php  'ubuntu-12.04'
+    deployConfiguration php/alpine        php  'alpine-*'
 
     # deploy php7 configuration to *-php7 containers
     clearConfiguration  php  'debian-*-php7'
@@ -275,6 +286,7 @@ function header() {
     clearConfiguration  php-apache  '*'
     deployConfiguration apache/general      php-apache  '*'
     deployConfiguration apache/centos       php-apache  'centos-*'
+    deployConfiguration apache/alpine       php-apache  'alpine-*'
     deployConfiguration php-apache/general  php-apache  '*'
 }
 
@@ -284,6 +296,7 @@ function header() {
     clearConfiguration  php-nginx  '*'
     deployConfiguration nginx/general      php-nginx  '*'
     deployConfiguration nginx/centos       php-nginx  'centos-*'
+    deployConfiguration nginx/alpine       php-nginx  'alpine-*'
     deployConfiguration php-nginx/general  php-nginx  '*'
 }
 

docker/ansible/alpine-3/Dockerfile

@@ -0,0 +1,9 @@
+#++++++++++++++++++++++++++++++++++++++
+# Alpine 3 Ansible Docker container
+#++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/bootstrap:alpine-3
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=6
+LABEL io.webdevops.version=0.22.0

docker/ansible/centos-7/Dockerfile

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

docker/ansible/debian-7/Dockerfile

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

docker/ansible/debian-8/Dockerfile

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

docker/ansible/debian-9/Dockerfile

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

docker/ansible/ubuntu-12.04/Dockerfile

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