summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/Docker.hs1
-rw-r--r--config-joey.hs3
2 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 493fdf57..6be8c4e2 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -230,7 +230,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
if runningident == Just ident
then return NoChange
else do
- print "stopping!"
void $ stopContainer cid
restartcontainer
else ifM (elem cid <$> listContainers AllContainers)
diff --git a/config-joey.hs b/config-joey.hs
index 975434d3..42fb43af 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -43,8 +43,9 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
& Apt.unattendedUpgrades
& Docker.configured
& Apt.buildDep ["git-annex"]
- & Docker.docked container hostname "amd64-git-annex-builder"
+ ! Docker.docked container hostname "amd64-git-annex-builder"
! Docker.docked container hostname "i386-git-annex-builder"
+ -- ! Docker.docked container hostname "armel-git-annex-builder"
& Docker.garbageCollected
-- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props