Skip to content

Commit 57c8c04

Browse files
mblaschkemblaschke
committed
Merge branch 'release/0.56.1'
2 parents fd972dc + 831e1a5 commit 57c8c04

File tree

203 files changed

+179
-727
lines changed

Some content is hidden

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

203 files changed

+179
-727
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
44

55
## [1.0.0] - upcoming
66

7+
## [0.56.1] - 2016-09-12
8+
- Removed geoip database
9+
710
## [0.56.0] - 2016-09-11
811
- Fix non caching resource files not be passed to document root in `php-nginx-dev`
912
- Added update of geoip database for applications (currently testing only)

‎docker/ansible/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/ansible/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1

‎docker/apache-dev/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache-dev/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/alpine-3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/centos-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-8/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/debian-9/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-12.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-14.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-15.10/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

‎docker/apache/ubuntu-16.04/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV WEB_DOCUMENT_ROOT /app
1414
ENV WEB_DOCUMENT_INDEX index.php

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
- include: bootstrap/dnsmasq.yml
66
- include: bootstrap/postfix.yml
77
- include: bootstrap/ssh.yml
8-
- include: bootstrap/geoip.yml

‎docker/base-app/alpine-3/conf/provision/roles/webdevops-base-app/tasks/bootstrap/geoip.yml

-39
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
- include: bootstrap/dnsmasq.yml
66
- include: bootstrap/postfix.yml
77
- include: bootstrap/ssh.yml
8-
- include: bootstrap/geoip.yml

‎docker/base-app/centos-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap/geoip.yml

-39
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
88
MAINTAINER [email protected]
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=0.56.0
11+
LABEL io.webdevops.version=0.56.1
1212

1313
ENV APPLICATION_USER application
1414
ENV APPLICATION_GROUP application

‎docker/base-app/debian-7/conf/provision/roles/webdevops-base-app/tasks/bootstrap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
- include: bootstrap/dnsmasq.yml
66
- include: bootstrap/postfix.yml
77
- include: bootstrap/ssh.yml
8-
- include: bootstrap/geoip.yml

0 commit comments

Comments
 (0)