@@ -3,16 +3,11 @@
4module Docker where
4module Docker where
6−import Control.Applicative ((<$>), (<*>))
6+import Control.Monad.Reader (ask, lift)
7−import Control.Monad.Catch
8−import Control.Monad.Except (catchError, throwError)
9−import Control.Monad.IO.Class (MonadIO, liftIO)
10−import Control.Monad.Reader (ask)
11−import Control.Monad.Reader (lift)
12−import Data.Aeson (decode)
7+import Data.Aeson (decode)
13−import Data.Maybe (fromJust)
8+import Data.Maybe (fromJust)
14−import Network.HTTP.Client (responseBody)
9+import Network.HTTP.Client (responseBody)
15−import Network.HTTP.Types (StdMethod (..))
10+import Network.HTTP.Types (StdMethod (..))
17import Docker.Http
12import Docker.Http
18import Docker.Internal
13import Docker.Internal
@@ -22,27 +17,24 @@ getDockerVersion :: forall m. Monad m => DockerT m DockerVersion
22getDockerVersion = do
17getDockerVersion = do
23 (opts, httpHandler) <- ask
18 (opts, httpHandler) <- ask
24 let request = fromJust $ mkHttpRequest GET VersionEndpoint opts
19 let request = fromJust $ mkHttpRequest GET VersionEndpoint opts
25− response <- lift . lift $ ((httpHandler request) :: m Response)
20+ response <- lift . lift $ (httpHandler request :: m Response)
26− let body = responseBody response
21+ let res = decode $ responseBody response
27− let res = decode body
28 return $ fromJust res
22 return $ fromJust res
30listContainers :: forall m. Monad m => ListOpts -> DockerT m [Container]
24listContainers :: forall m. Monad m => ListOpts -> DockerT m [Container]
31listContainers lopts = do
25listContainers lopts = do
32 (opts, httpHandler) <- ask
26 (opts, httpHandler) <- ask
33 let request = fromJust $ mkHttpRequest GET (ListContainersEndpoint lopts) opts
27 let request = fromJust $ mkHttpRequest GET (ListContainersEndpoint lopts) opts
34− response <- lift . lift $ ((httpHandler request) :: m Response)
28+ response <- lift . lift $ (httpHandler request :: m Response)
35− let body = responseBody response
29+ let res = decode $ responseBody response
36− let res = decode body
37 return $ fromJust res
30 return $ fromJust res
39listImages :: forall m. Monad m => ListOpts -> DockerT m [Image]
32listImages :: forall m. Monad m => ListOpts -> DockerT m [Image]
40listImages lopts = do
33listImages lopts = do
41 (opts, httpHandler) <- ask
34 (opts, httpHandler) <- ask
42 let request = fromJust $ mkHttpRequest GET (ListImagesEndpoint lopts) opts
35 let request = fromJust $ mkHttpRequest GET (ListImagesEndpoint lopts) opts
43− response <- lift . lift $ ((httpHandler request) :: m Response)
36+ response <- lift . lift $ (httpHandler request :: m Response)
44− let body = responseBody response
37+ let res = decode $ responseBody response
45− let res = decode body
46 return $ fromJust res
38 return $ fromJust res
48createContainer :: forall m. Monad m => CreateOpts -> DockerT m ContainerID
40createContainer :: forall m. Monad m => CreateOpts -> DockerT m ContainerID
@@ -52,49 +44,49 @@ startContainer :: forall m. Monad m => StartOpts -> ContainerID -> DockerT m Con
52startContainer sopts cid = do
44startContainer sopts cid = do
53 (opts, httpHandler) <- ask
45 (opts, httpHandler) <- ask
54 let request = fromJust $ mkHttpRequest POST (StartContainerEndpoint sopts cid) opts
46 let request = fromJust $ mkHttpRequest POST (StartContainerEndpoint sopts cid) opts
55− _ <- lift . lift $ ((httpHandler request) :: m Response)
47+ _ <- lift . lift $ (httpHandler request :: m Response)
56 return cid
48 return cid
58stopContainer :: forall m. Monad m => Timeout -> ContainerID ->DockerT m ContainerID
50stopContainer :: forall m. Monad m => Timeout -> ContainerID ->DockerT m ContainerID
59stopContainer t cid = do
51stopContainer t cid = do
60 (opts, httpHandler) <- ask
52 (opts, httpHandler) <- ask
61 let request = fromJust $ mkHttpRequest POST (StopContainerEndpoint t cid) opts
53 let request = fromJust $ mkHttpRequest POST (StopContainerEndpoint t cid) opts
62− _ <- lift . lift $ ((httpHandler request) :: m Response)
54+ _ <- lift . lift $ (httpHandler request :: m Response)
63 return cid
55 return cid
65killContainer :: forall m. Monad m => Signal -> ContainerID -> DockerT m ContainerID
57killContainer :: forall m. Monad m => Signal -> ContainerID -> DockerT m ContainerID
66killContainer s cid = do
58killContainer s cid = do
67 (opts, httpHandler) <- ask
59 (opts, httpHandler) <- ask
68 let request = fromJust $ mkHttpRequest POST (KillContainerEndpoint s cid) opts
60 let request = fromJust $ mkHttpRequest POST (KillContainerEndpoint s cid) opts
69− _ <- lift . lift $ ((httpHandler request) :: m Response)
61+ _ <- lift . lift $ (httpHandler request :: m Response)
70 return cid
62 return cid
72restartContainer :: forall m. Monad m => Timeout -> ContainerID -> DockerT m ContainerID
64restartContainer :: forall m. Monad m => Timeout -> ContainerID -> DockerT m ContainerID
73restartContainer t cid = do
65restartContainer t cid = do
74 (opts, httpHandler) <- ask
66 (opts, httpHandler) <- ask
75 let request = fromJust $ mkHttpRequest POST (RestartContainerEndpoint t cid) opts
67 let request = fromJust $ mkHttpRequest POST (RestartContainerEndpoint t cid) opts
76− _ <- lift . lift $ ((httpHandler request) :: m Response)
68+ _ <- lift . lift $ (httpHandler request :: m Response)
77 return cid
69 return cid
79pauseContainer :: forall m. Monad m => ContainerID -> DockerT m ContainerID
71pauseContainer :: forall m. Monad m => ContainerID -> DockerT m ContainerID
80pauseContainer cid = do
72pauseContainer cid = do
81 (opts, httpHandler) <- ask
73 (opts, httpHandler) <- ask
82 let request = fromJust $ mkHttpRequest POST (PauseContainerEndpoint cid) opts
74 let request = fromJust $ mkHttpRequest POST (PauseContainerEndpoint cid) opts
83− _ <- lift . lift $ ((httpHandler request) :: m Response)
75+ _ <- lift . lift $ (httpHandler request :: m Response)
84 return cid
76 return cid
86unpauseContainer :: forall m. Monad m => ContainerID -> DockerT m ContainerID
78unpauseContainer :: forall m. Monad m => ContainerID -> DockerT m ContainerID
87unpauseContainer cid = do
79unpauseContainer cid = do
88 (opts, httpHandler) <- ask
80 (opts, httpHandler) <- ask
89 let request = fromJust $ mkHttpRequest GET (UnpauseContainerEndpoint cid) opts
81 let request = fromJust $ mkHttpRequest GET (UnpauseContainerEndpoint cid) opts
90− _ <- lift . lift $ ((httpHandler request) :: m Response)
82+ _ <- lift . lift $ (httpHandler request :: m Response)
91 return cid
83 return cid
93deleteContainer :: forall m. Monad m => DeleteOpts -> ContainerID -> DockerT m ContainerID
85deleteContainer :: forall m. Monad m => DeleteOpts -> ContainerID -> DockerT m ContainerID
94deleteContainer dopts cid = do
86deleteContainer dopts cid = do
95 (opts, httpHandler) <- ask
87 (opts, httpHandler) <- ask
96 let request = fromJust $ mkHttpRequest DELETE (DeleteContainerEndpoint dopts cid) opts
88 let request = fromJust $ mkHttpRequest DELETE (DeleteContainerEndpoint dopts cid) opts
97− _ <- lift . lift $ ((httpHandler request) :: m Response)
89+ _ <- lift . lift $ (httpHandler request :: m Response)
98 return cid
90 return cid
100getContainerLogs :: forall m. Monad m => LogOpts -> ContainerID -> DockerT m ()
92getContainerLogs :: forall m. Monad m => LogOpts -> ContainerID -> DockerT m ()