Merge branch 'release/0.56.0'

webdevops · Sep 10, 2016 · fd972dc · fd972dc
2 parents 206b3e1 + 96a961b
commit fd972dc
Show file tree

Hide file tree

Showing 254 changed files with 873 additions and 201 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.56.0] - 2016-09-11
+- Fix non caching resource files not be passed to document root in `php-nginx-dev`
+- Added update of geoip database for applications (currently testing only)
+- Added graphviz and ttf-dejavu for `sphinx`
+- Added setting `VIRTUAL_HOST` to internal loopback address via dnsmasq
+
 ## [0.55.3] - 2016-07-30
 - Moved gpg to base 
 

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Dockerfile                                                | Description
 
 # Building
 
-Lokal building of containers can be done with `make` and `Makefile`:
+Local building of containers can be done with `make` and `Makefile`:
 
 Command                     | Description                                                                       
 --------------------------- | ----------------------------------------------------------------------------------

diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.d/10-init.sh
@@ -1,5 +1,5 @@
 ## clear dns file
-echo > /etc/dnsmasq.d/development
+echo > /etc/dnsmasq.d/webdevops
 
 if [ ! -f /etc/resolv.conf.original ]; then
     cp -a /etc/resolv.conf /etc/resolv.conf.original
@@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
     ## set dnsmasq to main nameserver
     echo "nameserver 127.0.0.1" > /etc/resolv.conf
 fi
+
+# Add own VIRTUAL_HOST as loopback
+if [[ -n "${VIRTUAL_HOST+x}" ]]; then
+    echo "address=/${VIRTUAL_HOST}/127.0.0.1" >>  /etc/dnsmasq.d/webdevops
+fi
diff --git a/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/alpine-3/conf/etc/supervisor.d/dnsmasq.conf
@@ -6,7 +6,7 @@ priority=15
 command = /opt/docker/bin/service.d/dnsmasq.sh
 process_name=%(program_name)s
 startsecs = 0
-autostart = false
+autostart = true
 autorestart = true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0

diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml
@@ -5,3 +5,4 @@
 - include: bootstrap/dnsmasq.yml
 - include: bootstrap/postfix.yml
 - include: bootstrap/ssh.yml
+- include: bootstrap/geoip.yml
diff --git a/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/geoip.yml b/docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/geoip.yml
@@ -0,0 +1,39 @@
+---
+
+- name: Maxmind directory
+  file:
+    path:  /usr/share/GeoIP/
+    mode:  0755
+    owner: root
+    state: directory
+
+- name: Fetch Maxmind db
+  get_url:
+    url:  '{{ item.url }}'
+    dest: '/usr/share/GeoIP/{{ item.dest }}'
+    mode: 0444
+  with_items:
+  # GeoLite
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz',                   dest: 'GeoLite2-City.mmdb.gz' }
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz',                dest: 'GeoLite2-Country.mmdb.gz' }
+  # Legacy
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz',             dest: 'GeoIP.dat.gz' }
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz',                          dest: 'GeoIPv6.dat.gz' }
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz',                      dest: 'GeoLiteCity.dat.gz' }
+   - { url: 'https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz', dest: 'GeoLiteCityv6.dat.gz' }
+   - { url: 'https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz',                dest: 'GeoIPASNum.dat.gz' }
+   - { url: 'https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz',              dest: 'GeoIPASNumv6.dat.gz' }
+
+- name: Extract Maxmind db
+  command: gunzip -f /usr/share/GeoIP/{{ item }}.gz
+  with_items:
+    # GeoLite
+    - GeoLite2-City.mmdb
+    - GeoLite2-Country.mmdb
+    # Legacy
+    - GeoIP.dat
+    - GeoIPv6.dat
+    - GeoLiteCity.dat
+    - GeoLiteCityv6.dat
+    - GeoIPASNum.dat
+    - GeoIPASNumv6.dat
diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile
@@ -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=0.55.3
+LABEL io.webdevops.version=0.56.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/base-app/centos-7/conf/bin/service.d/dnsmasq.d/10-init.sh
@@ -1,5 +1,5 @@
 ## clear dns file
-echo > /etc/dnsmasq.d/development
+echo > /etc/dnsmasq.d/webdevops
 
 if [ ! -f /etc/resolv.conf.original ]; then
     cp -a /etc/resolv.conf /etc/resolv.conf.original
@@ -10,3 +10,8 @@ if [ ! -f /etc/resolv.conf.original ]; then
     ## set dnsmasq to main nameserver
     echo "nameserver 127.0.0.1" > /etc/resolv.conf
 fi
+
+# Add own VIRTUAL_HOST as loopback
+if [[ -n "${VIRTUAL_HOST+x}" ]]; then
+    echo "address=/${VIRTUAL_HOST}/127.0.0.1" >>  /etc/dnsmasq.d/webdevops
+fi
diff --git a/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/base-app/centos-7/conf/etc/supervisor.d/dnsmasq.conf
@@ -6,7 +6,7 @@ priority=15
 command = /opt/docker/bin/service.d/dnsmasq.sh
 process_name=%(program_name)s
 startsecs = 0
-autostart = false
+autostart = true
 autorestart = true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0

diff --git a/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml b/docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml
@@ -5,3 +5,4 @@
 - include: bootstrap/dnsmasq.yml
 - include: bootstrap/postfix.yml
 - include: bootstrap/ssh.yml
+- include: bootstrap/geoip.yml