propellor spin

Propellor/Property/Docker.hs

@@ -233,23 +233,19 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
 				else do
 					error "container parameters changed"
 					void $ stopContainer cid
-					oldimage <- fromMaybe image <$> commitContainer cid
+					restartcontainer
-					void $ removeContainer cid
+		else ifM (elem cid <$> listContainers AllContainers)
-					go oldimage
+			( restartcontainer
-		else do
-			ifM (elem cid <$> listContainers AllContainers)
-				( do
-					-- Contaner may be stopped, or
-					-- may not exist.
-					void $ stopContainer cid
-					oldimage <- fromMaybe image <$> commitContainer cid
-					void $ removeContainer cid
-					go oldimage
 			, go image
 			)
   where
 	ident = ContainerIdent image hn cn runps
 
+	restartcontainer = do
+		oldimage <- fromMaybe image <$> commitContainer cid
+		void $ removeContainer cid
+		go oldimage
+
 	getrunningident :: IO (Maybe ContainerIdent)
 	getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do
 		print (rs, extractident rs)

config-joey.hs

@@ -36,7 +36,6 @@ host hostname@"clam.kitenet.net" = standardSystem Unstable $ props
 	& Tor.isBridge
 	& JoeySites.oldUseNetshellBox
 	& Docker.configured
-	! Docker.docked container hostname "amd64-git-annex-builder"
 	& Docker.garbageCollected
 -- Orca is the main git-annex build box.
 host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
@@ -45,7 +44,7 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
 	& Docker.configured
 	& Apt.buildDep ["git-annex"]
 	& 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.garbageCollected
 -- My laptop
 host _hostname@"darkstar.kitenet.net" = Just $ props