propellor spin

config-joey.hs

@@ -360,6 +360,7 @@ jerryPlay = standardContainer "jerryplay" Unstable "amd64"
 kiteShellBox :: Docker.Container
 kiteShellBox = standardStableContainer "kiteshellbox"
 	& JoeySites.kiteShellBox
+	& Docker.publish "4242:4242"
 
 type Motd = [String]
 

debian/changelog

@@ -2,6 +2,7 @@ propellor (2.2.1) UNRELEASED; urgency=medium
 
   * userScriptProperty now passes --shell /bin/sh, so it can be used
     even for users with nonstandard shells.
+  * Fix bug in docker propellor shim setup introduced in last release.
 
  -- Joey Hess <id@joeyh.name>  Wed, 11 Mar 2015 22:29:23 -0400
 

src/Propellor/Shim.hs

@@ -34,7 +34,7 @@ setup propellorbin propellorbinpath dest = checkAlreadyShimmed propellorbin $ do
 		fromMaybe (error "cannot find ld-linux linker") $
 			headMaybe $ filter ("ld-linux" `isInfixOf`) libs'
 	let linkersym = takeDirectory linker </> takeFileName propellorbin
-	createSymbolicLink linkersym (takeFileName linker)
+	createSymbolicLink (takeFileName linker) linkersym
 
 	let gconvdir = (dest ++) $ takeDirectory $
 		fromMaybe (error "cannot find gconv directory") $