From 9755b761bb46bc40d19a2723165424a1f8a27cbb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 Nov 2014 15:55:58 -0400 Subject: [PATCH] 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. --- debian/changelog | 2 ++ src/Propellor/Property/Docker.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5b45c85..8c79d51 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 Thu, 30 Oct 2014 16:36:06 -0400 diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index d9d5f19..5a7a084 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