Merge branch 'release/0.53.0'

CHANGELOG.md

@@ -4,6 +4,15 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.53.0] - 2016-06-23
+- Added apache-dev and nginx-dev
+- Restructed php-*dev provision
+- Removed whoami call
+- Removed provision from `make all` and `make build` 
+- Removed --force from apk-install
+- Fixed pecl for alpine images
+- Updated documentation and tests 
+
 ## [0.52.0] - 2016-06-20
 - Added tag centos-7-php56 for php images
 - Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables

Makefile

@@ -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}"
 

README.md

@@ -1,6 +1,6 @@
-# WebDevOps Dockerfiles
+![Dockerfile](https://static.webdevops.io/dockerfile.svg)
 
-Dockerfiles for various prebuilt docker containers
+Automated built and tested on [WebDevOps Build server](https://build.webdevops.io/) sponsored by [<img src="https://static.webdevops.io/sponsor-infogene.png" width="100">](http://infogene.fr/)
 
 [![Docker layout](documentation/docs/resources/images/docker-image-layout.gv.png)](documentation/docs/resources/images/docker-image-layout.gv.png)
 
@@ -38,6 +38,7 @@ Command                     | Description
 `make baselayout`           | Build and deploy baselayout.tar
 `make provision`            | Deploy all configuration files from [_provisioning/](_provisioning/README.md)
 `make dist-update`          | Update local distrubtion images (CentOS, Debian, Ubuntu)
+`make full`                 | Run provision and build all images
 <br>                        |
 `make test`                 | Run testsuite (use currently available docker images on your docker host)
 `make test-hub-images`      | Run testsuite but pull newest docker images from docker hub first

baselayout/usr/local/bin/apk-install

@@ -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/*

bin/provision.sh

@@ -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

docker/ansible/alpine-3/Dockerfile

@@ -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

docker/ansible/centos-7/Dockerfile

@@ -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/debian-7/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/debian-8/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-9/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

docker/ansible/ubuntu-12.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 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/ubuntu-14.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 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/ubuntu-15.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
 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/ubuntu-15.10/Dockerfile

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

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
 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/apache-dev/README.md

@@ -0,0 +1,44 @@
+# Apache webserver Docker container
+
+Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/)
+
+## Environment variables
+
+Variable               | Description
+---------------------- | ------------------------------------------------------------------------------
+`CLI_SCRIPT`           | Predefined CLI script for service
+`APPLICATION_UID`      | PHP-FPM UID (Effective user ID)
+`APPLICATION_GID`      | PHP-FPM GID (Effective group ID)
+`WEB_DOCUMENT_ROOT`    | Document root for Apache HTTPD
+`WEB_DOCUMENT_INDEX`   | Document index (eg. `index.php`) for Apache HTTPD
+`WEB_ALIAS_DOMAIN`     | Alias domains (eg. `*.vm`) for Apache HTTPD
+
+## Filesystem layout
+
+Directory                       | Description
+------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/httpd`         | Apache configuration
+`/opt/docker/etc/httpd/ssl`     | Apache ssl configuration with example server.crt, server.csr, server.key
+
+File                                          | Description
+--------------------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/httpd/main.conf`             | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) 
+`/opt/docker/etc/httpd/global.conf`           | Global apache configuration options
+`/opt/docker/etc/httpd/conf.d/*.conf`         | Global apache configuration directory (will be included)
+`/opt/docker/etc/httpd/php.conf`              | PHP configuration (connection to FPM)
+`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included)
+`/opt/docker/etc/httpd/vhost.conf`            | Default vhost
+`/opt/docker/etc/httpd/vhost.ssl.conf`        | Default ssl configuration for vhost
+
+
+## Container info
+
+Image                               | Info                                                                       
+----------------------------------- | ----------------------------------------------------------------------------------
+webdevops/apache:latest             | [![](https://badge.imagelayers.io/webdevops/apache:latest.svg)](https://imagelayers.io/?images=webdevops/apache:latest 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-14.04       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-14.04 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-15.04       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.04 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-15.10       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.14 'Get your own badge on imagelayers.io')
+webdevops/apache:centos-7           | [![](https://badge.imagelayers.io/webdevops/apache:centos-7.svg)](https://imagelayers.io/?images=webdevops/apache:centos-7 'Get your own badge on imagelayers.io')
+webdevops/apache:debian-7           | [![](https://badge.imagelayers.io/webdevops/apache:debian-7.svg)](https://imagelayers.io/?images=webdevops/apache:debian-7 'Get your own badge on imagelayers.io')
+webdevops/apache:debian-8           | [![](https://badge.imagelayers.io/webdevops/apache:debian-8.svg)](https://imagelayers.io/?images=webdevops/apache:debian-8 'Get your own badge on imagelayers.io')

docker/apache-dev/alpine-3/Dockerfile

@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:alpine-3
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:alpine-3
+
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.53.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443

docker/apache-dev/alpine-3/Dockerfile.jinja2

@@ -0,0 +1,11 @@
+{{ docker.from("apache", "alpine-3") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}

docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

@@ -0,0 +1,2 @@
+---
+

docker/apache-dev/centos-7/Dockerfile

@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:centos-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:centos-7
+
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.53.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443

docker/apache-dev/centos-7/Dockerfile.jinja2

@@ -0,0 +1,11 @@
+{{ docker.from("apache", "centos-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}

docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

@@ -0,0 +1,2 @@
+---
+

docker/apache-dev/debian-7/Dockerfile

@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:debian-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:debian-7
+
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.53.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443

docker/apache-dev/debian-7/Dockerfile.jinja2

@@ -0,0 +1,11 @@
+{{ docker.from("apache", "debian-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}

docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

@@ -0,0 +1,2 @@
+---
+

docker/apache-dev/debian-8/Dockerfile

@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:debian-8
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:debian-8
+
+MAINTAINER [email protected]
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.53.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443

docker/apache-dev/debian-8/Dockerfile.jinja2

@@ -0,0 +1,11 @@
+{{ docker.from("apache", "debian-8") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}

docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml

@@ -0,0 +1,2 @@
+---
+