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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 17:16:13 -04:00
parent be32443833 6e5362b12f
commit 5b78dcae2a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-joey.hs
View File

@ -1,4 +1,4 @@
-- | This is the live config file used by propellor's author. -- This is the live config file used by propellor's author.
import Propellor import Propellor
import Propellor.CmdLine import Propellor.CmdLine
@ -229,7 +229,7 @@ standardContainer name suite arch = Docker.container name (image system)
where where
system = System (Debian suite) arch system = System (Debian suite) arch
-- | Docker images I prefer to use. -- Docker images I prefer to use.
image :: System -> Docker.Image image :: System -> Docker.Image
image (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch image (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch
image (System (Debian Stable) arch) = "joeyh/debian-stable-" ++ arch image (System (Debian Stable) arch) = "joeyh/debian-stable-" ++ arch

2
config-simple.hs
View File

@ -1,4 +1,4 @@
-- | This is the main configuration file for Propellor, and is used to build -- This is the main configuration file for Propellor, and is used to build
-- the propellor program. -- the propellor program.
import Propellor import Propellor