Merge branch 'master' into develop

mblaschke · mblaschke · commit aca8af807b3e · 2016-06-25T12:34:15.000+02:00
diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.alpine('php-apache apache-dev') }}
+{{ apache.alpine('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.alpine('php-apache apache-dev') }}
+{{ apache.alpine('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.centos('php-apache apache-dev') }}
+{{ apache.centos('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.centos('php-apache apache-dev') }}
+{{ apache.centos('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache apache-dev') }}
+{{ apache.debian8('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache apache-dev') }}
+{{ apache.debian8('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache apache-dev') }}
+{{ apache.debian8('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian9('php-apache apache-dev') }}
+{{ apache.debian9('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu12('php-apache apache-dev') }}
+{{ apache.ubuntu12('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu14('php-apache apache-dev') }}
+{{ apache.ubuntu14('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu15('php-apache apache-dev') }}
+{{ apache.ubuntu15('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu16('php-apache apache-dev') }}
+{{ apache.ubuntu16('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu16('php-apache apache-dev') }}
+{{ apache.ubuntu16('php-apache apache-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.alpine('php-nginx nginx-dev') }}
+{{ nginx.alpine('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.alpine('php-nginx nginx-dev') }}
+{{ nginx.alpine('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.centos('php-nginx nginx-dev') }}
+{{ nginx.centos('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.centos('php-nginx nginx-dev') }}
+{{ nginx.centos('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev php-dev') }}
 
 {{ docker.expose('80 443') }}
