diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-06-16 14:52:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-16 14:52:50 -0400 |
| commit | 948f855c63d6f2da09ce3689d1b610b343501f73 (patch) | |
| tree | 08f29ab858812f8ec9794a2b7bbaa9e3b37e39a9 | |
| parent | 182fa98253072781795ad4f589da4216748b1218 (diff) | |
update for Docker.Image changes
| -rw-r--r-- | config-joey.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index 93a44764..8b53718a 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index 6e641881..079ecf48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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, |