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

update for Docker.Image changes

This commit is contained in:
Joey Hess 2015-06-16 14:52:50 -04:00
parent 182fa98253
commit 948f855c63
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-joey.hs
View File

@ -505,10 +505,10 @@ standardDockerContainer name suite arch = Docker.container name (dockerImage sys
-- Docker images I prefer to use.
dockerImage :: System -> Docker.Image
dockerImage (System (Debian Unstable) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
dockerImage (System (Debian Testing) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
dockerImage (System (Debian (Stable _)) arch) = Docker.Image ("joeyh/debian-stable-" ++ arch) Nothing
dockerImage _ = Docker.Image "debian-stable-official" Nothing -- does not currently exist!
dockerImage (System (Debian Unstable) arch) = Docker.latestImage ("joeyh/debian-unstable-" ++ arch)
dockerImage (System (Debian Testing) arch) = Docker.latestImage ("joeyh/debian-unstable-" ++ arch)
dockerImage (System (Debian (Stable _)) arch) = Docker.latestImage ("joeyh/debian-stable-" ++ arch)
dockerImage _ = Docker.latestImage "debian-stable-official" -- does not currently exist!
myDnsSecondary :: Property HasInfo
myDnsSecondary = propertyList "dns secondary for all my domains" $ props

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
propellor (2.6.0) UNRELEASED; urgency=medium
* Replace String type synonym Docker.Image by a data type
which allows to specify an image name and an optional tag. (API change)
Thanks, Antoine Eiche.
-- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400
propellor (2.5.0) unstable; urgency=medium
* cmdProperty' renamed to cmdPropertyEnv to make way for a new,