git.iko.soy/docker-hs
on master help sign in
Merge branch 'master' of github.com:denibertovic/docker-hs
commit0bd663277ecb0d00906c540615d873c675310100 authorDeni Bertovic <deni@kset.org> dateWed 17 Dec 2014, 22:31 (12 years ago) parent703d16033a7c6f
3 files changed+6−6
compare with master
unifiedsplit
Network/Docker.hs+3−3 Network/Docker/Types.hs+2−2 docker.cabal+1−1
Network/Docker.hs+3−3
@@ -5,7 +5,7 @@ module Network.Docker where
55import Control.Applicative ((<$>), (<*>))
66import Control.Lens
77import Data.Aeson (FromJSON, ToJSON, decode, eitherDecode,
8− encode)
8+ toJSON)
99import Data.Aeson.Lens (key, _String)
1010import Data.Aeson.TH
1111import qualified Data.ByteString.Lazy as L
@@ -44,10 +44,10 @@ _dockerGetQuery :: Endpoint -> DockerClientOpts -> IO(Response L.ByteString)
4444_dockerGetQuery endpoint clientOpts = get (fullUrl clientOpts endpoint)
4545
4646_dockerPostQuery :: ToJSON a => Endpoint -> DockerClientOpts -> a -> IO (Response L.ByteString)
47−_dockerPostQuery endpoint clientOpts postObject = post (fullUrl clientOpts endpoint) (encode postObject)
47+_dockerPostQuery endpoint clientOpts postObject = post (fullUrl clientOpts endpoint) (toJSON postObject)
4848
4949emptyPost = "" :: String
50−_dockerEmptyPostQuery endpoint clientOpts = post (fullUrl clientOpts endpoint) (encode emptyPost)
50+_dockerEmptyPostQuery endpoint clientOpts = post (fullUrl clientOpts endpoint) (toJSON emptyPost)
5151
5252getDockerVersion :: DockerClientOpts -> IO (Maybe DockerVersion)
5353getDockerVersion = decodeResponse . _dockerGetQuery "/version"
Network/Docker/Types.hs+2−2
@@ -156,7 +156,7 @@ data StartContainerOpts = StartContainerOpts
156156 { _Binds :: [T.Text]
157157 , _Links :: [T.Text]
158158 , _LxcConf :: [(T.Text, T.Text)]
159− , _PortBindings :: [(T.Text, [(T.Text, T.Text)])]
159+ , _PortBindings :: [((Int,T.Text),Int)]
160160 , _PublishAllPorts :: Bool
161161 , _Privileged :: Bool
162162 , _Dns :: [T.Text]
@@ -179,7 +179,7 @@ instance ToJSON StartContainerOpts where
179179 [ "Binds" .= _Binds
180180 , "Links" .= _Links
181181 , "LxcConf" .= _LxcConf
182− , "PortBindings" .= _PortBindings
182+ , "PortBindings" .= object (map (\((h,p),c)->T.concat [T.pack (show h),"/",p] .= [object ["HostPort" .= show c]]) _PortBindings)
183183 , "PublishAllPorts" .= _PublishAllPorts
184184 , "Privileged" .= _Privileged
185185 , "Dns" .= _Dns
docker.cabal+1−1
@@ -2,7 +2,7 @@
22-- documentation, see http://haskell.org/cabal/users-guide/
33
44name: docker
5−version: 0.1.0.1
5+version: 0.2.0.0
66synopsis: Haskell wrapper for Docker Remote API
77-- description:
88homepage: https://github.com/denibertovic/docker-hs