Skip to content

Commit 485191c

Browse files
mblaschkemblaschke
committed
Merge branch 'release/1.2.1'
2 parents 0ddd8fc + 49e8a3e commit 485191c

File tree

187 files changed

+210
-200
lines changed

Some content is hidden

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

187 files changed

+210
-200
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion

‎README.md‎

Lines changed: 5 additions & 0 deletions

‎conf/console.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ dockerTest:
4444
OS_FAMILY: 'alpine'
4545
OS_VERSION: '3'
4646
PHP_MHASH: '0'
47+
PHP_REDIS: '0'
4748
':ubuntu-12.04':
4849
OS_FAMILY: 'ubuntu'
4950
OS_VERSION: '12.04'

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

‎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.0
11+
LABEL io.webdevops.version=1.2.1

0 commit comments

Comments
 (0)