Skip to content

Commit 0ddd8fc

Browse files
committed
Merge branch 'release/1.2.0'
2 parents 4547ce0 + 5bcf0b3 commit 0ddd8fc

File tree

309 files changed

+2538
-761
lines changed

Some content is hidden

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

309 files changed

+2538
-761
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
44

5+
## [1.2.0] - 2016-12-20
6+
- Add mod_proxy_fcgi and mod_fastcgi configuration for Apache (Debian 9 doesn't provide mod_fastcgi anymore; using ifmodule-directive for automatic configuration switching)
7+
- Removed mod_fastcgi on most installations were it is not needed
8+
- Added tests to ensure /dev/null and /dev/zero are writeable
9+
- Removed postfix hostname (is sometimes injected via installation)
10+
- Fixed smaller bugs
11+
- Fixed bin/console docker:exec command execution
12+
- Updated gems for serverspec
13+
514
## [1.1.4] - 2016-12-20
615
- Add task dependencies for docker:push (push in the right order)
716
- Show blacklist/whitelist for bin/console commands (even if not in verbose mode)

bin/command/docker_exec_command.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ def run_task(self, configuration):
6464
'-t',
6565
'--rm',
6666
dockerfile['image']['fullname'],
67-
'sh -c "%s"' % (' '.join(docker_command))
67+
'bash',
68+
'-c',
69+
'%s' % (' '.join(docker_command))
6870
]
69-
7071
status = Command.execute(cmd)
7172

7273
if status:

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

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
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

docker/ansible/ubuntu-15.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
88
99
LABEL vendor=WebDevOps.io
1010
LABEL io.webdevops.layout=8
11-
LABEL io.webdevops.version=1.1.4
11+
LABEL io.webdevops.version=1.2.0

0 commit comments

Comments
 (0)