6477978 · docker-hs · git.iko.soy

git.iko.soy/docker-hs

Fixes indentaion

somewhat... :/

commit64779783d9b7912da662904ef08b635f592305bb authorDeni Bertovic <deni@denibertovic.com> dateTue 23 Feb 2016, 16:10 (11 years ago) parentf26ca63

3 files changed+113−58

compare with master

unifiedsplit

Network/Docker.hs+20−11 Network/Docker/Internal.hs+86−39 Network/Docker/Types.hs+7−8

Network/Docker.hs+20−11

@@ -21,38 +21,47 @@ import qualified Pipes.HTTP as PH

2121import Text.Printf (printf)

2222

2323import Network.Docker.Internal

24−import Network.Docker.Options

2524import Network.Docker.Types

2625

2726getDockerVersion :: DockerClientOpts -> IO (Maybe DockerVersion)

28−getDockerVersion clientOpts = decodeResponse <$> runDocker (getDockerVersionM clientOpts SVersionEndpoint)

27+getDockerVersion clientOpts = decodeResponse <$>

28+ runDocker (getDockerVersionM clientOpts SVersionEndpoint)

2929

3030listContainers :: DockerClientOpts -> IO (Maybe [DockerContainer])

31−listContainers clientOpts = decodeResponse <$> runDocker (listContainersM clientOpts SListContainersEndpoint)

31+listContainers clientOpts = decodeResponse <$>

32+ runDocker (listContainersM clientOpts SListContainersEndpoint)

3233

3334listImages :: DockerClientOpts -> IO (Maybe [DockerImage])

34−listImages clientOpts = decodeResponse <$> runDocker (listImagesM clientOpts SListImagesEndpoint)

35+listImages clientOpts = decodeResponse <$>

36+ runDocker (listImagesM clientOpts SListImagesEndpoint)

3537

3638createContainer :: DockerClientOpts -> CreateContainerOpts -> IO(Maybe T.Text)

37−createContainer clientOpts createOpts = getElemFromResponse "Id" <$> runDocker (createContainerM clientOpts (SCreateContainerEndpoint) createOpts)

39+createContainer clientOpts createOpts = getElemFromResponse "Id" <$>

40+ runDocker (createContainerM clientOpts (SCreateContainerEndpoint) createOpts)

3841

3942startContainer :: DockerClientOpts -> String -> StartContainerOpts -> IO(Status)

40−startContainer clientOpts cid startOpts = (^. responseStatus) <$> runDocker (startContainerM clientOpts (SStartContainerEndpoint cid) startOpts)

43+startContainer clientOpts cid startOpts = (^. responseStatus) <$>

44+ runDocker (startContainerM clientOpts (SStartContainerEndpoint cid) startOpts)

4145

4246stopContainer :: DockerClientOpts -> String -> IO (Status)

43−stopContainer clientOpts cid = (^. responseStatus) <$> runDocker (stopContainerM clientOpts (SStopContainerEndpoint cid))

47+stopContainer clientOpts cid = (^. responseStatus) <$>

48+ runDocker (stopContainerM clientOpts (SStopContainerEndpoint cid))

4449

4550killContainer :: DockerClientOpts -> String -> IO (Status)

46−killContainer clientOpts cid = (^. responseStatus) <$> runDocker (killContainerM clientOpts (SKillContainerEndpoint cid))

51+killContainer clientOpts cid = (^. responseStatus) <$>

52+ runDocker (killContainerM clientOpts (SKillContainerEndpoint cid))

4753

4854restartContainer :: DockerClientOpts -> String -> IO (Status)

49−restartContainer clientOpts cid = (^. responseStatus) <$> runDocker (restartContainerM clientOpts (SRestartContainerEndpoint cid))

55+restartContainer clientOpts cid = (^. responseStatus) <$>

56+ runDocker (restartContainerM clientOpts (SRestartContainerEndpoint cid))

5057

5158pauseContainer :: DockerClientOpts -> String -> IO (Status)

52−pauseContainer clientOpts cid = (^. responseStatus) <$> runDocker (pauseContainerM clientOpts (SPauseContainerEndpoint cid))

59+pauseContainer clientOpts cid = (^. responseStatus) <$>

60+ runDocker (pauseContainerM clientOpts (SPauseContainerEndpoint cid))

5361

5462unpauseContainer :: DockerClientOpts -> String -> IO (Status)

55−unpauseContainer clientOpts cid = (^. responseStatus) <$> runDocker (unpauseContainerM clientOpts (SUnpauseContainerEndpoint cid))

63+unpauseContainer clientOpts cid = (^. responseStatus) <$>

64+ runDocker (unpauseContainerM clientOpts (SUnpauseContainerEndpoint cid))

5665

5766deleteContainer :: DockerClientOpts -> DeleteOpts -> String -> IO (Status)

5867deleteContainer c d cid = deleteContainerWithOpts c d cid

Network/Docker/Internal.hs+86−39

@@ -56,87 +56,134 @@ getEndpoint (SDeleteContainerEndpoint cid (DeleteOpts removeVolumes force)) =

5656

5757setupSSLCtx :: SSLOptions -> IO SSLContext

5858setupSSLCtx (SSLOptions key cert) = do

59− ctx <- SSL.context

60− SSL.contextSetPrivateKeyFile ctx key

61− SSL.contextSetCertificateFile ctx cert

62− SSL.contextAddOption ctx SSL.SSL_OP_NO_SSLv3

63− SSL.contextAddOption ctx SSL.SSL_OP_NO_SSLv2

64− return ctx

59+ ctx <- SSL.context

60+ SSL.contextSetPrivateKeyFile ctx key

61+ SSL.contextSetCertificateFile ctx cert

62+ SSL.contextAddOption ctx SSL.SSL_OP_NO_SSLv3

63+ SSL.contextAddOption ctx SSL.SSL_OP_NO_SSLv2

64+ return ctx

6565

6666mkOpts c = defaults & manager .~ Left (opensslManagerSettings c)

6767

6868getSSL

69− :: SSLOptions

70− -> String

71− -> IO (Response L.ByteString)

69+ :: SSLOptions

70+ -> String

71+ -> IO (Response L.ByteString)

7272getSSL sopts url = withOpenSSL $ getWith (mkOpts $ setupSSLCtx sopts) url

7373

7474postSSL

75− :: ToJSON a

76− => SSLOptions

77− -> String

78− -> a

79− -> IO (Response L.ByteString)

75+ :: ToJSON a

76+ => SSLOptions

77+ -> String

78+ -> a

79+ -> IO (Response L.ByteString)

8080postSSL sopts url = withOpenSSL . postWith (mkOpts $ setupSSLCtx sopts) url . toJSON

8181

8282deleteSSL

83− :: SSLOptions

84− -> String

85− -> IO (Response L.ByteString)

83+ :: SSLOptions

84+ -> String

85+ -> IO (Response L.ByteString)

8686deleteSSL sopts url = withOpenSSL $ deleteWith (mkOpts $ setupSSLCtx sopts) url

8787

8888fullUrl :: DockerClientOpts -> SEndpoint a -> URL

89−fullUrl clientOpts endpoint = constructUrl (baseUrl clientOpts) (apiVersion clientOpts) (getEndpoint endpoint)

89+fullUrl clientOpts endpoint =

90+ constructUrl (baseUrl clientOpts) (apiVersion clientOpts) (getEndpoint endpoint)

9091

9192_dockerGetQuery :: DockerClientOpts -> SEndpoint a -> HttpRequestM (SEndpoint a)

92−_dockerGetQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint = Free (Get (fullUrl clientOpts endpoint))

93−_dockerGetQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint = Free (GetSSL sslOpts (fullUrl clientOpts endpoint))

93+_dockerGetQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint =

94+ Free (Get (fullUrl clientOpts endpoint))

95+_dockerGetQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint =

96+ Free (GetSSL sslOpts (fullUrl clientOpts endpoint))

9497

9598_dockerPostQuery :: ToJSON b => DockerClientOpts -> SEndpoint a -> b -> HttpRequestM (SEndpoint a)

96−_dockerPostQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint postObject = Free (Post (fullUrl clientOpts endpoint) (toJSON postObject))

97−_dockerPostQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint postObject = Free (PostSSL sslOpts (fullUrl clientOpts endpoint) (toJSON postObject))

99+_dockerPostQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint postObject =

100+ Free (Post (fullUrl clientOpts endpoint) (toJSON postObject))

101+_dockerPostQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint postObject =

102+ Free (PostSSL sslOpts (fullUrl clientOpts endpoint) (toJSON postObject))

98103

99104_dockerEmptyPostQuery :: DockerClientOpts -> SEndpoint a -> HttpRequestM (SEndpoint a)

100−_dockerEmptyPostQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint = Free (Post (fullUrl clientOpts endpoint) (toJSON emptyPost))

101−_dockerEmptyPostQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint = Free (PostSSL sslOpts (fullUrl clientOpts endpoint) (toJSON emptyPost))

105+_dockerEmptyPostQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint =

106+ Free (Post (fullUrl clientOpts endpoint) (toJSON emptyPost))

107+_dockerEmptyPostQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint =

108+ Free (PostSSL sslOpts (fullUrl clientOpts endpoint) (toJSON emptyPost))

102109

103110_dockerDeleteQuery :: DockerClientOpts -> SEndpoint a -> HttpRequestM (SEndpoint a)

104−_dockerDeleteQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint = Free (Delete (fullUrl clientOpts endpoint))

105−_dockerDeleteQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint = Free (DeleteSSL sslOpts (fullUrl clientOpts endpoint))

106−

107−getDockerVersionM :: DockerClientOpts -> SEndpoint VersionEndpoint -> HttpRequestM (SEndpoint VersionEndpoint)

111+_dockerDeleteQuery clientOpts@DockerClientOpts{ssl = NoSSL} endpoint =

112+ Free (Delete (fullUrl clientOpts endpoint))

113+_dockerDeleteQuery clientOpts@DockerClientOpts{ssl = SSL sslOpts} endpoint =

114+ Free (DeleteSSL sslOpts (fullUrl clientOpts endpoint))

115+

116+getDockerVersionM

117+ :: DockerClientOpts

118+ -> SEndpoint VersionEndpoint

119+ -> HttpRequestM (SEndpoint VersionEndpoint)

108120getDockerVersionM clientOpts e = _dockerGetQuery clientOpts e

109121

110−stopContainerM :: DockerClientOpts -> SEndpoint StopContainerEndpoint -> HttpRequestM (SEndpoint StopContainerEndpoint)

122+stopContainerM

123+ :: DockerClientOpts

124+ -> SEndpoint StopContainerEndpoint

125+ -> HttpRequestM (SEndpoint StopContainerEndpoint)

111126stopContainerM clientOpts e = _dockerEmptyPostQuery clientOpts e

112127

113−listContainersM :: DockerClientOpts -> SEndpoint ListContainersEndpoint -> HttpRequestM (SEndpoint ListContainersEndpoint)

128+listContainersM

129+ :: DockerClientOpts

130+ -> SEndpoint ListContainersEndpoint

131+ -> HttpRequestM (SEndpoint ListContainersEndpoint)

114132listContainersM clientOpts e = _dockerGetQuery clientOpts e

115133

116−listImagesM :: DockerClientOpts -> SEndpoint ListImagesEndpoint -> HttpRequestM (SEndpoint ListImagesEndpoint)

134+listImagesM

135+ :: DockerClientOpts

136+ -> SEndpoint ListImagesEndpoint

137+ -> HttpRequestM (SEndpoint ListImagesEndpoint)

117138listImagesM clientOpts e = _dockerGetQuery clientOpts e

118139

119−killContainerM :: DockerClientOpts -> SEndpoint KillContainerEndpoint -> HttpRequestM (SEndpoint KillContainerEndpoint)

140+killContainerM

141+ :: DockerClientOpts

142+ -> SEndpoint KillContainerEndpoint

143+ -> HttpRequestM (SEndpoint KillContainerEndpoint)

120144killContainerM clientOpts e = _dockerEmptyPostQuery clientOpts e

121145

122−restartContainerM :: DockerClientOpts -> SEndpoint RestartContainerEndpoint -> HttpRequestM (SEndpoint RestartContainerEndpoint)

146+restartContainerM

147+ :: DockerClientOpts

148+ -> SEndpoint RestartContainerEndpoint

149+ -> HttpRequestM (SEndpoint RestartContainerEndpoint)

123150restartContainerM clientOpts e = _dockerEmptyPostQuery clientOpts e

124151

125−pauseContainerM :: DockerClientOpts -> SEndpoint PauseContainerEndpoint -> HttpRequestM (SEndpoint PauseContainerEndpoint)

152+pauseContainerM

153+ :: DockerClientOpts

154+ -> SEndpoint PauseContainerEndpoint

155+ -> HttpRequestM (SEndpoint PauseContainerEndpoint)

126156pauseContainerM clientOpts e = _dockerEmptyPostQuery clientOpts e

127157

128−unpauseContainerM :: DockerClientOpts -> SEndpoint UnpauseContainerEndpoint -> HttpRequestM (SEndpoint UnpauseContainerEndpoint)

158+unpauseContainerM

159+ :: DockerClientOpts

160+ -> SEndpoint UnpauseContainerEndpoint

161+ -> HttpRequestM (SEndpoint UnpauseContainerEndpoint)

129162unpauseContainerM clientOpts e = _dockerEmptyPostQuery clientOpts e

130163

131−createContainerM :: DockerClientOpts -> SEndpoint CreateContainerEndpoint -> CreateContainerOpts -> HttpRequestM (SEndpoint CreateContainerEndpoint)

164+createContainerM

165+ :: DockerClientOpts

166+ -> SEndpoint CreateContainerEndpoint

167+ -> CreateContainerOpts

168+ -> HttpRequestM (SEndpoint CreateContainerEndpoint)

132169createContainerM clientOpts e c = _dockerPostQuery clientOpts e c

133170

134−startContainerM :: DockerClientOpts -> SEndpoint StartContainerEndpoint -> StartContainerOpts -> HttpRequestM (SEndpoint StartContainerEndpoint)

171+startContainerM

172+ :: DockerClientOpts

173+ -> SEndpoint StartContainerEndpoint

174+ -> StartContainerOpts

175+ -> HttpRequestM (SEndpoint StartContainerEndpoint)

135176startContainerM clientOpts e c = _dockerPostQuery clientOpts e c

136177

137−deleteContainerM :: DockerClientOpts -> SEndpoint DeleteContainerEndpoint -> HttpRequestM (SEndpoint DeleteContainerEndpoint)

178+deleteContainerM

179+ :: DockerClientOpts

180+ -> SEndpoint DeleteContainerEndpoint

181+ -> HttpRequestM (SEndpoint DeleteContainerEndpoint)

138182deleteContainerM clientOpts e = _dockerDeleteQuery clientOpts e

139183

140−getContainerLogsM :: DockerClientOpts -> SEndpoint ContainerLogsEndpoint -> HttpRequestM (SEndpoint ContainerLogsEndpoint)

184+getContainerLogsM

185+ :: DockerClientOpts

186+ -> SEndpoint ContainerLogsEndpoint

187+ -> HttpRequestM (SEndpoint ContainerLogsEndpoint)

141188getContainerLogsM clientOpts e = _dockerGetQuery clientOpts e

142189

Network/Docker/Types.hs+7−8

@@ -14,15 +14,14 @@ import Control.Monad.Free

1414import Data.Aeson

1515import Data.Aeson.Types

1616import Data.Bool

17−import qualified Data.ByteString.Lazy as L

17+import qualified Data.ByteString.Lazy as L

1818import Data.Default

19−import qualified Data.Map as Map

20−import qualified Data.Text as T

21−import GHC.Generics (Generic)

22−import Network.Docker.Options

23−import Network.Wreq.Types (Postable)

24−import OpenSSL.Session (SSLContext)

25−import Prelude hiding (id)

19+import qualified Data.Map as Map

20+import qualified Data.Text as T

21+import GHC.Generics (Generic)

22+import Network.Wreq.Types (Postable)

23+import OpenSSL.Session (SSLContext)

24+import Prelude hiding (id)

2625

2726type URL = String

2827type ApiVersion = String