on master help sign in
Adds ContainerID and ImageID

Beucase wtf is String anyway.

commit6ddce62552d4a9c52a6371d87ed220d0bf2290d8 authorDeni Bertovic <deni@denibertovic.com> dateThu 25 Feb 2016, 21:19 (11 years ago) parent9891900
2 files changed+23−20
Network/Docker.hs+11−11 Network/Docker/Types.hs+12−9
Network/Docker.hs+11−11
@@ -45,57 +45,57 @@ createContainer createOpts = do
4545 clientOpts <- ask
4646 getElemFromResponse "Id" <$> runDocker (createContainerM clientOpts (SCreateContainerEndpoint) createOpts)
4747
48−startContainer :: String -> StartContainerOpts -> DockerM IO (Status)
48+startContainer :: ContainerID -> StartContainerOpts -> DockerM IO (Status)
4949startContainer cid startOpts = do
5050 clientOpts <- ask
5151 (^. responseStatus) <$> runDocker (startContainerM clientOpts (SStartContainerEndpoint cid) startOpts)
5252
53−stopContainer :: String -> DockerM IO (Status)
53+stopContainer :: ContainerID -> DockerM IO (Status)
5454stopContainer cid = do
5555 clientOpts <- ask
5656 (^. responseStatus) <$> runDocker (stopContainerM clientOpts (SStopContainerEndpoint cid))
5757
58−killContainer :: String -> DockerM IO (Status)
58+killContainer :: ContainerID -> DockerM IO (Status)
5959killContainer cid = do
6060 clientOpts <- ask
6161 (^. responseStatus) <$> runDocker (killContainerM clientOpts (SKillContainerEndpoint cid))
6262
63−restartContainer :: String -> DockerM IO (Status)
63+restartContainer :: ContainerID -> DockerM IO (Status)
6464restartContainer cid = do
6565 clientOpts <- ask
6666 (^. responseStatus) <$> runDocker (restartContainerM clientOpts (SRestartContainerEndpoint cid))
6767
68−pauseContainer :: String -> DockerM IO (Status)
68+pauseContainer :: ContainerID -> DockerM IO (Status)
6969pauseContainer cid = do
7070 clientOpts <- ask
7171 (^. responseStatus) <$> runDocker (pauseContainerM clientOpts (SPauseContainerEndpoint cid))
7272
73−unpauseContainer :: String -> DockerM IO (Status)
73+unpauseContainer :: ContainerID -> DockerM IO (Status)
7474unpauseContainer cid = do
7575 clientOpts <- ask
7676 (^. responseStatus) <$> runDocker (unpauseContainerM clientOpts (SUnpauseContainerEndpoint cid))
7777
78−deleteContainer :: String -> DockerM IO (Status)
78+deleteContainer :: ContainerID -> DockerM IO (Status)
7979deleteContainer cid = do
8080 c <- ask
8181 deleteContainerWithOpts defaultDeleteOpts cid
8282
83−deleteContainerWithOpts :: DeleteOpts -> String -> DockerM IO (Status)
83+deleteContainerWithOpts :: DeleteOpts -> ContainerID -> DockerM IO (Status)
8484deleteContainerWithOpts deleteOpts cid = do
8585 clientOpts <- ask
8686 (^. responseStatus) <$> runDocker (deleteContainerM clientOpts (SDeleteContainerEndpoint cid deleteOpts))
8787
88−getContainerLogsWithOpts :: LogOpts -> String -> DockerM IO (L.ByteString)
88+getContainerLogsWithOpts :: LogOpts -> ContainerID -> DockerM IO (L.ByteString)
8989getContainerLogsWithOpts l cid = do
9090 clientOpts <- ask
9191 (^. responseBody) <$> runDocker (getContainerLogsM clientOpts (SContainerLogsEndpoint cid l))
9292
93−getContainerLogs :: String -> DockerM IO (L.ByteString)
93+getContainerLogs :: ContainerID -> DockerM IO (L.ByteString)
9494getContainerLogs cid = do
9595 clientOpts <- ask
9696 (^. responseBody) <$> runDocker (getContainerLogsM clientOpts (SContainerLogsEndpoint cid defaultLogOpts))
9797
98−getContainerLogsStream :: String -> DockerM IO ()
98+getContainerLogsStream :: ContainerID -> DockerM IO ()
9999getContainerLogsStream cid = do
100100 clientOpts <- ask
101101 req <- PH.parseUrl (fullUrl clientOpts url)
Network/Docker/Types.hs+12−9
@@ -19,14 +19,17 @@ import Data.Bool
1919import qualified Data.ByteString.Lazy as L
2020import Data.Default
2121import qualified Data.Map as Map
22+import Data.String (IsString, fromString)
2223import qualified Data.Text as T
2324import GHC.Generics (Generic)
2425import Network.Wreq.Types (Postable)
2526import OpenSSL.Session (SSLContext)
26−import Prelude hiding (id)
2727
2828type DockerM m a = ReaderT DockerClientOpts m a
2929
30+type ContainerID = String
31+type ImageID = String
32+
3033type URL = String
3134type ApiVersion = String
3235
@@ -63,14 +66,14 @@ data SEndpoint (a :: Endpoint) where
6366 SListContainersEndpoint :: SEndpoint ListContainersEndpoint
6467 SListImagesEndpoint :: SEndpoint ListImagesEndpoint
6568 SCreateContainerEndpoint :: SEndpoint CreateContainerEndpoint
66− SStartContainerEndpoint :: String -> SEndpoint StartContainerEndpoint
67− SStopContainerEndpoint :: String -> SEndpoint StopContainerEndpoint
68− SKillContainerEndpoint :: String -> SEndpoint KillContainerEndpoint
69− SRestartContainerEndpoint :: String -> SEndpoint RestartContainerEndpoint
70− SPauseContainerEndpoint :: String -> SEndpoint PauseContainerEndpoint
71− SUnpauseContainerEndpoint :: String -> SEndpoint UnpauseContainerEndpoint
72− SContainerLogsEndpoint :: String -> LogOpts-> SEndpoint ContainerLogsEndpoint
73− SDeleteContainerEndpoint :: String -> DeleteOpts -> SEndpoint DeleteContainerEndpoint
69+ SStartContainerEndpoint :: ContainerID -> SEndpoint StartContainerEndpoint
70+ SStopContainerEndpoint :: ContainerID -> SEndpoint StopContainerEndpoint
71+ SKillContainerEndpoint :: ContainerID -> SEndpoint KillContainerEndpoint
72+ SRestartContainerEndpoint :: ContainerID -> SEndpoint RestartContainerEndpoint
73+ SPauseContainerEndpoint :: ContainerID -> SEndpoint PauseContainerEndpoint
74+ SUnpauseContainerEndpoint :: ContainerID -> SEndpoint UnpauseContainerEndpoint
75+ SContainerLogsEndpoint :: ContainerID -> LogOpts-> SEndpoint ContainerLogsEndpoint
76+ SDeleteContainerEndpoint :: ContainerID -> DeleteOpts -> SEndpoint DeleteContainerEndpoint
7477
7578defaultClientOpts :: DockerClientOpts
7679defaultClientOpts = DockerClientOpts