Skip to content

Commit 0652cff

Browse files
mblaschkemblaschke
committed
Merge branch 'release/1.2.4'
2 parents 7537b0b + c86b5d5 commit 0652cff

File tree

253 files changed

+706
-229
lines changed

Some content is hidden

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

253 files changed

+706
-229
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions

‎conf/console.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ dockerTest:
7676
PHP_XDEBUG: '0'
7777
':debian-9':
7878
OS_FAMILY: 'debian'
79-
OS_VERSION: 'testing'
79+
OS_VERSION: '9'
8080
':centos-7':
8181
OS_FAMILY: 'redhat'
8282
OS_VERSION: '7'

‎conf/provision.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ provision:
6363
php-dev:
6464
configuration:
6565
php-dev/general : '*'
66+
development/general: '*'
6667
php-apache-dev:
6768
configuration:
6869
apache/general : '*'

‎docker/ansible/alpine-3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/centos-7/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/debian-7/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/debian-8/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/debian-9/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/ubuntu-12.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

‎docker/ansible/ubuntu-14.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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=1.2.3
11+
LABEL io.webdevops.version=1.2.4

0 commit comments

Comments
 (0)