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

propellor spin

This commit is contained in:
Joey Hess 2014-04-04 16:03:12 -04:00
parent 1f783394c0
commit e64a66b21b
Failed to extract signature
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Propellor/Property/Docker.hs
View File

@ -230,7 +230,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
if runningident == Just ident if runningident == Just ident
then return NoChange then return NoChange
else do else do
print "stopping!"
void $ stopContainer cid void $ stopContainer cid
restartcontainer restartcontainer
else ifM (elem cid <$> listContainers AllContainers) else ifM (elem cid <$> listContainers AllContainers)

3
config-joey.hs
View File

@ -43,8 +43,9 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Docker.configured & Docker.configured
& Apt.buildDep ["git-annex"] & 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 "i386-git-annex-builder"
-- ! Docker.docked container hostname "armel-git-annex-builder"
& Docker.garbageCollected & Docker.garbageCollected
-- My laptop -- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props host _hostname@"darkstar.kitenet.net" = Just $ props