Merge branch 'release/0.22.0'

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

docker/ansible/ubuntu-14.04/Dockerfile

@@ -5,5 +5,5 @@
 FROM webdevops/bootstrap:ubuntu-14.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

docker/ansible/ubuntu-15.04/Dockerfile

@@ -5,5 +5,5 @@
 FROM webdevops/bootstrap:ubuntu-15.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

docker/ansible/ubuntu-15.10/Dockerfile

@@ -5,5 +5,5 @@
 FROM webdevops/bootstrap:ubuntu-15.10
 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-16.04/Dockerfile

@@ -5,5 +5,5 @@
 FROM webdevops/bootstrap:ubuntu-16.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

docker/apache/alpine-3/Dockerfile

@@ -0,0 +1,34 @@
+#++++++++++++++++++++++++++++++++++++++
+# Alpine 3 Apache Docker container
+#++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/base:alpine-3
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=6
+LABEL io.webdevops.version=0.21.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+# Install apache
+RUN /usr/local/bin/apk-install \
+        apache2 \
+        apache2-utils \
+        apache2-proxy \
+        apache2-ssl \
+	&& sed -ri ' \
+		s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
+		s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
+		' /etc/apache2/httpd.conf
+
+# Deploy scripts/configurations
+COPY conf/ /opt/docker/
+RUN bash /opt/docker/bin/control.sh provision.role.bootstrap webdevops-apache \
+    && bash /opt/docker/bin/bootstrap.sh
+
+EXPOSE 80 443
+
+CMD ["supervisord"]
+

docker/apache/alpine-3/conf/bin/service.d/httpd.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
+    echo ""
+    echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
+    echo ""
+fi
+
+# Apache gets grumpy about PID files pre-existing
+rm -f /var/run/httpd/httpd.pid
+
+rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" /opt/docker/etc/httpd/*.conf
+rpl --quiet "<DOCUMENT_ROOT>"  "$WEB_DOCUMENT_ROOT"  /opt/docker/etc/httpd/*.conf
+rpl --quiet "<ALIAS_DOMAIN>"   "$WEB_ALIAS_DOMAIN"   /opt/docker/etc/httpd/*.conf
+rpl --quiet "<SERVERNAME>"     "$HOSTNAME"           /opt/docker/etc/httpd/*.conf
+
+exec /usr/sbin/apachectl -DFOREGROUND

docker/apache/alpine-3/conf/etc/httpd/global.conf

@@ -0,0 +1,39 @@
+# Settings
+TimeOut      1000
+ServerName   "<SERVERNAME>"
+
+DirectoryIndex <DOCUMENT_INDEX>
+DocumentRoot "<DOCUMENT_ROOT>"
+
+<Directory "<DOCUMENT_ROOT>">
+  Options Indexes FollowSymLinks
+  AllowOverride All
+
+  <IfVersion < 2.4>
+      Allow from all
+  </IfVersion>
+  <IfVersion >= 2.4>
+      Require all granted
+  </IfVersion>
+</Directory>
+
+
+LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
+CustomLog /proc/self/fd/1 dockerlog
+ErrorLog  /proc/self/fd/2
+
+#######################################
+# Faster error documents
+#######################################
+<Location ~ "(\.jpeg|\.jpg|\.gif|\.png|\.ico|\.js|\.css|\.map|\.json|\.xml|robots\.txt)$">
+  ErrorDocument 400 "400 Bad Request"
+  ErrorDocument 401 "401 Unauthorized"
+  ErrorDocument 403 "403 Forbidden"
+  ErrorDocument 404 "404 Not Found"
+  ErrorDocument 405 "405 Method Not Allowed"
+
+  ErrorDocument 500 "500 Internal Server Error"
+  ErrorDocument 501 "501 Not Implemented"
+  ErrorDocument 502 "502 Bad Gateway"
+  ErrorDocument 503 "503 Service Unavailable"
+</Location>

docker/apache/alpine-3/conf/etc/httpd/main.conf

@@ -0,0 +1,3 @@
+Include /opt/docker/etc/httpd/global.conf
+Include /opt/docker/etc/httpd/php.conf
+Include /opt/docker/etc/httpd/vhost.conf

docker/apache/alpine-3/conf/etc/httpd/php.conf

@@ -0,0 +1,8 @@
+
+<Proxy fcgi://127.0.0.1:9000>
+  ProxySet connectiontimeout=5 timeout=600
+</Proxy>
+
+<FilesMatch \.php$>
+    SetHandler "proxy:fcgi://127.0.0.1:9000"
+</FilesMatch>

docker/apache/alpine-3/conf/etc/httpd/ssl/server.crt

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE1DCCArwCCQDMMwGnSuK0tTANBgkqhkiG9w0BAQsFADAsMRswGQYDVQQKExJE
+b2NrZXIgQm9pbGVycGxhdGUxDTALBgNVBAMUBCoudm0wHhcNMTUwNTA0MTcxNDQw
+WhcNMjUwNTAxMTcxNDQwWjAsMRswGQYDVQQKExJEb2NrZXIgQm9pbGVycGxhdGUx
+DTALBgNVBAMUBCoudm0wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDK
+3TIUiyDvXelWeY9VXMrpjuZtYpVSDsACLpjFUhMnsP5/iKT0VbeZyqHvmwZjAg4G
+Y10d+yZDdgv/xeu0HPOFbtR6pCp10d1tdLHZto5Cyuxu7IQsAVjnD6Ko7XFwtNk7
+9o6JZfAFaGL4w5MokrVmCtspnsMZH7/7zU4f96cbF39zLopnpuXGD6t6DA8Qj3gy
+0duaTjs42bYRN+rwLzVKAev99iQ4kPMJn4vV6/Xk6rtoSzC67GQyVZYaFypicD1S
+NtsRmgEVvjCBDbrLOneUiRwff6qxEsZi7Hxv7BKFj4iUWnII7K/nP7T6uBHQjHO+
+FpsGkU9lCMrCeVFBe8kKz/cbhd+yLUxXwAPr6gSOPmwn232Gy4tozvqZHpbUxsgx
+7sT3ej9K66h1D7J+BjNFWYM1hbnC1r7H/xS7EBzBV8qRoQCVe08Juf5xsouXFakD
+clLV4+L+1cxkpwsCQDly5g3tm/TBqA2O+ZJ+YHQDHKkzMyhLs6i0X/M5qvJBiLg1
+GLTCS20rpQ5gXTEGuINqHgwXQWkUO6bhgSYqdHGX3zbZ5+qWpI4eui3dHZ1Ll0VH
+6Icpb7ORTQwhc6W8KBlybssYPSlGOEBGUjYGNheoz9FpoSkxCis+P8ZNKtrmpPoq
+Su0eOOGFOFHG02eOgPVxSwrDeN9MVJo7BPysGMHJmQIDAQABMA0GCSqGSIb3DQEB
+CwUAA4ICAQC63g6NHmQKbiy3G6iaDkpUSbr5Mq2YgU61XnvWVyREqDcy/BXCw9oY
+SJ/KUvCpqPnACNOFqjadRAmPiA9nf2WduoCgwQGV/YRFGswSuVvh/3X2TX5NWvbS
+t8MQDttQg1dxpiMUjlu3rqhfohBdWJvp2lVSdpDb/MOlXBc/+p7HfOHwhqB7wwPN
+NNbSKUbZqZxmD8cOf1X0hASr1yfFPj+2vST3ESaON8S0T2p63YX/sD5jvOUiEuyw
+I5WcvLmiRZA07SH8nWyckLY3qWL+OlhSZrlAnolWS00b+7h5LNuRYEjKzwVgntoA
+aCopyQih6wIk0+AfJO4sfhJBmQhnIrAaP/zwBH5g9zVizLf5H7U+hNXrMwgw55Sq
+vjMdkZHvPKUXTvVit/rYE9H+PY3brkRWzOl4V/i/ZLJJm5805H/NyTbz9kPMJw2Q
+nn+KOpfXXySD39f8iuRgSKXsYNul38hxWgcZZ6g+sOOp2n/VUmf0eZUWNnJ8i7AP
+4Qif7aDKMcibOwSwsB+DKZXDvZ5XSdnMphtuLS5rPSL81rVRmWC2DMfQ2eP8j0WN
+VTroSk0xedQ7Qr+9TNooi9IyzX6n1a2S1UiciEZ3ZcDbXPl/P01m+IYZyPnLv0+9
+ZeioZYh1JLv3/OKsMrMLTfh2ZCj3aXwmc2Owi/wU2LS5QUOMcHH7CQ==
+-----END CERTIFICATE-----

docker/apache/alpine-3/conf/etc/httpd/ssl/server.csr

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEcTCCAlkCAQAwLDEbMBkGA1UEChMSRG9ja2VyIEJvaWxlcnBsYXRlMQ0wCwYD
+VQQDFAQqLnZtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyt0yFIsg
+713pVnmPVVzK6Y7mbWKVUg7AAi6YxVITJ7D+f4ik9FW3mcqh75sGYwIOBmNdHfsm
+Q3YL/8XrtBzzhW7UeqQqddHdbXSx2baOQsrsbuyELAFY5w+iqO1xcLTZO/aOiWXw
+BWhi+MOTKJK1ZgrbKZ7DGR+/+81OH/enGxd/cy6KZ6blxg+regwPEI94MtHbmk47
+ONm2ETfq8C81SgHr/fYkOJDzCZ+L1ev15Oq7aEswuuxkMlWWGhcqYnA9UjbbEZoB
+Fb4wgQ26yzp3lIkcH3+qsRLGYux8b+wShY+IlFpyCOyv5z+0+rgR0IxzvhabBpFP
+ZQjKwnlRQXvJCs/3G4Xfsi1MV8AD6+oEjj5sJ9t9hsuLaM76mR6W1MbIMe7E93o/
+SuuodQ+yfgYzRVmDNYW5wta+x/8UuxAcwVfKkaEAlXtPCbn+cbKLlxWpA3JS1ePi
+/tXMZKcLAkA5cuYN7Zv0wagNjvmSfmB0AxypMzMoS7OotF/zOaryQYi4NRi0wktt
+K6UOYF0xBriDah4MF0FpFDum4YEmKnRxl9822efqlqSOHrot3R2dS5dFR+iHKW+z
+kU0MIXOlvCgZcm7LGD0pRjhARlI2BjYXqM/RaaEpMQorPj/GTSra5qT6KkrtHjjh
+hThRxtNnjoD1cUsKw3jfTFSaOwT8rBjByZkCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
+A4ICAQBsEBgC2YepuZq/8UqvKMZKVy/etDKXj7BB+QPb+leNiKD7p4LDxHJsZSH8
+Ku9uMPeLfiQDn5jA41k5SlGttzvObd65RdEbO3yHpqsg05EGSDDLfaE1k2Al/qmX
+/o8roPZF7+2kZthgMAgkcokS54LYqEYTGqOf3J9Ss0yRIZwhaOVebfFIbIOdpw0B
+JNMIJPHTMdZrcuRVI+wR1uPLIlEJzBvxTGbTrvPU25WJFtu+EajKqXO0SHdy0yx8
+uH4ykRBJRc36+oYo7nZ5D56dh7pZn3+9J64FKAOV0Q3KqMFieGy053ezuhJd70eZ
+UozTgfjs3WpMzoYmKETSyl3XZSdInRe+sUlKPruTsKyg69oYxjPlrGfAmmGcCFca
+TnZinT18dI92zK7OtOVkmYeYKC1lwuhftVrNMXzZuHOGpS9NNYtc4nDqDMIEOfV3
+6rCdu03WjEgJ+Z67tJs16xOx9du4/EHxS2Ijn9DPfVJvYy0TgzDi1BUpjWx0KTLx
+C4OQbEZ/QTWmHVbSch/hcZhzbf7SNh5RpnW4EtmcpDFjIKMfxJmoKeiTf7qnilx0
+7uRvsZFKoDKRDOFiPfgMg5AOtLHziYsd9m0tJjC2GHvFuPjzOtzhnUUjmmvht170
+2aqKakjST4amg7jzLcs871HX0/WjOtt29NpOz140blkKf1bisg==
+-----END CERTIFICATE REQUEST-----