summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-08 15:55:58 -0400
committerJoey Hess2014-11-08 15:55:58 -0400
commit9755b761bb46bc40d19a2723165424a1f8a27cbb (patch)
tree1bc104e89e66bb1e2cd108140d285c549c3becac
parentb2f60db9d192f1fe6b761b58839a44b8002dcfa6 (diff)
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.
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Docker.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b45c853..8c79d519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ propellor (0.9.2) UNRELEASED; urgency=medium
* Added nginx module, contributed by FĂ©lix Sipma.
* Added firewall module, contributed by Arnaud Bailly.
* 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
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index d9d5f191..5a7a0840 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -567,7 +567,7 @@ readIdentFile cid = fromMaybe (error "bad ident in identFile")
. readish <$> readFile (identFile cid)
dockercmd :: String
-dockercmd = "docker.io"
+dockercmd = "docker"
report :: [Bool] -> Result
report rmed