cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Docker: Stop using docker.io; that was a compat symlink in the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.

This commit is contained in:
Joey Hess 2014-11-08 15:55:58 -04:00
parent b2f60db9d1
commit 9755b761bb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ propellor (0.9.2) UNRELEASED; urgency=medium
* Added nginx module, contributed by Félix Sipma. * Added nginx module, contributed by Félix Sipma.
* Added firewall module, contributed by Arnaud Bailly. * Added firewall module, contributed by Arnaud Bailly.
* Apache: Fix daemon reload when enabling a new module or site. * Apache: Fix daemon reload when enabling a new module or site.
* Docker: Stop using docker.io; that was a compat symlink in
the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
-- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400 -- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400

2
src/Propellor/Property/Docker.hs
View File

@ -567,7 +567,7 @@ readIdentFile cid = fromMaybe (error "bad ident in identFile")
. readish <$> readFile (identFile cid) . readish <$> readFile (identFile cid)
dockercmd :: String dockercmd :: String
dockercmd = "docker.io" dockercmd = "docker"
report :: [Bool] -> Result report :: [Bool] -> Result
report rmed report rmed