Skip to content

Commit 86e444d

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.23.0'
2 parents e033e50 + 89e2996 commit 86e444d

File tree

233 files changed

+2375
-365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+2375
-365
lines changed

‎BLACKLIST

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
ubuntu-16.04
2-
debian-9
3-
alpine-3-php7
2+
debian-9

‎CHANGELOG.md

+7

‎FIXME.md

+3

‎README.md

+18-109

‎bin/provision.sh

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ function header() {
276276
deployConfiguration php/alpine php 'alpine-*'
277277

278278
# deploy php7 configuration to *-php7 containers
279-
clearConfiguration php 'debian-*-php7'
280279
deployConfiguration php/php7 php '*-php7'
281280
}
282281

‎docker/ansible/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:alpine-3
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.22.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:centos-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-8
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:debian-9
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/ansible/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0

‎docker/apache/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:alpine-3
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:centos-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-8
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-9
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-12.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-14.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.10
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-16.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV WEB_DOCUMENT_ROOT /app
1212
ENV WEB_DOCUMENT_INDEX index.php

‎docker/base-app/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:alpine-3
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.22.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/alpine-3/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:centos-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/centos-7/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/debian-7/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-8
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/debian-8/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:debian-9
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/debian-9/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-12.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-14.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-15.04/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-15.10
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-15.10/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base-app/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/base:ubuntu-16.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV APPLICATION_USER application
1212
ENV APPLICATION_GROUP application

‎docker/base-app/ubuntu-16.04/conf/bin/service.d/dnsmasq.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env bash
12

23
## clear dns file
34
echo > /etc/dnsmasq.d/development

‎docker/base/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:alpine-3
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.22.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:centos-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-7
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-8
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:debian-9
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-12.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-14.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

‎docker/base/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM webdevops/bootstrap:ubuntu-15.04
66
MAINTAINER [email protected]
77
LABEL vendor=WebDevOps.io
88
LABEL io.webdevops.layout=6
9-
LABEL io.webdevops.version=0.21.0
9+
LABEL io.webdevops.version=0.23.0
1010

1111
ENV DOCKER_CONF_HOME /opt/docker/
1212

0 commit comments

Comments
 (0)