Skip to content

Commit

Permalink
Merge branch 'release/0.23.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mblaschke
mblaschke committed Apr 15, 2016
2 parents e033e50 + 89e2996 commit 86e444d
Show file tree
Hide file tree
Showing 233 changed files with 2,375 additions and 365 deletions.
3 changes: 1 addition & 2 deletions BLACKLIST
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ubuntu-16.04
debian-9
alpine-3-php7
debian-9
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
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.23.0] - 2016-04-03
### Changed
- Enabled alpine-3-php7 images
- Fixed some smaller issues
- Added TYPO3 packages to sphinx image
- Fixed build system for new docker version (1.11.0)

## [0.22.0] - 2016-04-03
### Changed
- Introduced base-app for application images
Expand Down
3 changes: 3 additions & 0 deletions FIXME.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ Mostly upstream issues (eg. missing or broken packages)

## Alpine 3 (PHP5)
- Missing mhash

## Alpine 3 (PHP7)
- Missing gd
127 changes: 18 additions & 109 deletions README.md
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion bin/provision.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ function header() {
deployConfiguration php/alpine php 'alpine-*'

# deploy php7 configuration to *-php7 containers
clearConfiguration php 'debian-*-php7'
deployConfiguration php/php7 php '*-php7'
}

Expand Down
2 changes: 1 addition & 1 deletion docker/ansible/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.22.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-8
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-9
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/ansible/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0
2 changes: 1 addition & 1 deletion docker/apache/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:alpine-3
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:centos-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-8
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-9
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/apache/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV WEB_DOCUMENT_ROOT /app
ENV WEB_DOCUMENT_INDEX index.php
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:alpine-3
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.22.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:centos-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/centos-7/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/debian-7/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-8
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/debian-8/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:debian-9
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/debian-9/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-12.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-14.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-15.10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.10
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base-app/ubuntu-16.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-16.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV APPLICATION_USER application
ENV APPLICATION_GROUP application
Expand Down
1 change: 1 addition & 0 deletions docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

## clear dns file
echo > /etc/dnsmasq.d/development
Expand Down
2 changes: 1 addition & 1 deletion docker/base/alpine-3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:alpine-3
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.22.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:centos-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-7
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-8
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-9
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-12.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-12.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-14.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-14.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-15.04/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-15.04
MAINTAINER [email protected]
LABEL vendor=WebDevOps.io
LABEL io.webdevops.layout=6
LABEL io.webdevops.version=0.21.0
LABEL io.webdevops.version=0.23.0

ENV DOCKER_CONF_HOME /opt/docker/

Expand Down
Loading

0 comments on commit 86e444d

Please sign in to comment.