summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-10-23 02:50:50 -0400
committerJoey Hess2014-10-23 02:50:50 -0400
commita0e4c872b6733cba1b539afa43c644103c14d63b (patch)
treee89d5c2b24a364205836e59eadd7f1cf3091eb0d /src/Propellor/Property
parent4223e92129999e8e6eb5df847520c8a3edf9b223 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Docker.hs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 428d2c20..120b51cf 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -161,7 +161,6 @@ mkContainer cid@(ContainerId hn _cn) h = Container
-- name the container in a predictable way so we
-- and the user can easily find it later
& name (fromContainerId cid)
- -- & restart RestartAlways
-- | Causes *any* docker images that are not in use by running containers to
-- be deleted. And deletes any containers that propellor has set up
@@ -383,7 +382,13 @@ runningContainer cid@(ContainerId hn cn) image runps = containerDesc cid $ prope
shim <- liftIO $ Shim.setup (localdir </> "propellor") (localdir </> shimdir cid)
liftIO $ writeFile (identFile cid) (show ident)
ensureProperty $ boolProperty "run" $ runContainer img
- (runps ++ ["-i", "-d", "-t"])
+ -- Restart by default so container comes up on
+ -- boot or when docker is upgraded. This is put
+ -- here, rather than adding a default Property
+ -- in mkContainer, to avoid changing the ident
+ -- of existing containers. Any restart property
+ -- will override it.
+ ("--restart=always" : runps ++ ["-i", "-d", "-t"])
[shim, "--docker", fromContainerId cid]
-- | Called when propellor is running inside a docker container.