git.iko.soy/docker-hs
on master help sign in
Merge pull request #35 from jprider63/master
d1ec27aDeni Bertovic
.travis.yml+1
compare with master
unifiedsplit
@@ -24,6 +24,7 @@ services:
24env:
24env:
25 - GHCVER=7.10 STACK_ARGS=""
25 - GHCVER=7.10 STACK_ARGS=""
26 - GHCVER=8.0 STACK_ARGS=""
26 - GHCVER=8.0 STACK_ARGS=""
27+ - GHCVER=8.0.2 STACK_ARGS=""
27
28
28addons:
29addons:
29 apt:
30 apt:
CHANGELOG.md+4−1
@@ -1,5 +1,9 @@
1# CHANGELOG
1# CHANGELOG
2
2
3+## 0.4.0.2 (2017-09-19)
4+
5+- Support LTS 9.4
6+
3## 0.4.0.1 (2017-06-29)
7## 0.4.0.1 (2017-06-29)
4
8
5- fixes omKillDisable parsing from json
9- fixes omKillDisable parsing from json
@@ -13,7 +17,6 @@
13- Added support for streaming log output
17- Added support for streaming log output
14- Added support for pulling images from the hub (and streaming the output)
18- Added support for pulling images from the hub (and streaming the output)
15
19
16−
17## 0.3.0.1 (2016-09-07)
20## 0.3.0.1 (2016-09-07)
18
21
19- Small cosmetic changes and marking OVERLAPPING instance
22- Small cosmetic changes and marking OVERLAPPING instance
docker.cabal+7−7
@@ -1,5 +1,5 @@
1name: docker
1name: docker
2−version: 0.4.0.1
2+version: 0.4.0.2
3synopsis: An API client for docker written in Haskell
3synopsis: An API client for docker written in Haskell
4description: See API documentation below.
4description: See API documentation below.
5homepage: https://github.com/denibertovic/docker-hs
5homepage: https://github.com/denibertovic/docker-hs
@@ -15,17 +15,17 @@ cabal-version: >=1.10
15stability: experimental
15stability: experimental
16
16
17library
17library
18− default-extensions: DeriveGeneric, OverloadedStrings, ScopedTypeVariables, ExplicitForAll, MultiParamTypeClasses, FlexibleContexts, GeneralizedNewtypeDeriving, RankNTypes, DeriveFunctor, FlexibleInstances
18+ default-extensions: DeriveGeneric, OverloadedStrings, ScopedTypeVariables, ExplicitForAll, MultiParamTypeClasses, FlexibleContexts, GeneralizedNewtypeDeriving, RankNTypes, DeriveFunctor, FlexibleInstances, CPP
19 hs-source-dirs: src
19 hs-source-dirs: src
20 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
20 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
21 -- other-modules: Docker.Internal
21 -- other-modules: Docker.Internal
22 build-depends: base >= 4.7 && < 5
22 build-depends: base >= 4.7 && < 5
23− , aeson >= 0.9.0 && < 1.1.0
23+ , aeson >= 0.9.0 && < 1.2.0
24 , blaze-builder >= 0.4.0 && < 0.5.0
24 , blaze-builder >= 0.4.0 && < 0.5.0
25 , bytestring >= 0.10.0 && < 0.11.0
25 , bytestring >= 0.10.0 && < 0.11.0
26 , containers >= 0.5.0 && < 0.6.0
26 , containers >= 0.5.0 && < 0.6.0
27 , data-default-class >= 0.0.1 && < 0.2.0
27 , data-default-class >= 0.0.1 && < 0.2.0
28− , http-client >= 0.4.0 && < 0.5.0
28+ , http-client >= 0.4.0 && < 0.6.0
29 , http-types >= 0.9 && < 0.10.0
29 , http-types >= 0.9 && < 0.10.0
30 , vector
30 , vector
31 , conduit
31 , conduit
@@ -51,9 +51,9 @@ library
51 , scientific >= 0.3.0 && < 0.4.0
51 , scientific >= 0.3.0 && < 0.4.0
52 , tls >= 1.3.7 && < 1.4.0
52 , tls >= 1.3.7 && < 1.4.0
53 , unordered-containers >= 0.2.0 && < 0.3.0
53 , unordered-containers >= 0.2.0 && < 0.3.0
54− , x509 >= 1.6.0 && < 1.7.0
54+ , x509 >= 1.6.0 && < 1.8.0
55− , x509-store >= 1.6.0 && < 1.7.0
55+ , x509-store >= 1.6.0 && < 1.8.0
56− , x509-system >= 1.6.0 && < 1.7.0
56+ , x509-system >= 1.6.0 && < 1.8.0
57 default-language: Haskell2010
57 default-language: Haskell2010
58 ghc-options: -Wall -fno-warn-name-shadowing
58 ghc-options: -Wall -fno-warn-name-shadowing
59
59
src/Docker/Client/Http.hs+4
@@ -114,8 +114,12 @@ httpHandler manager = HttpHandler $ \request' sink -> do -- runResourceT ..
114 let request = NHS.setRequestManager manager request'
114 let request = NHS.setRequestManager manager request'
115 try (NHS.httpSink request sink) >>= \res -> case res of
115 try (NHS.httpSink request sink) >>= \res -> case res of
116 Right res -> return res
116 Right res -> return res
117+#if MIN_VERSION_http_client(0,5,0)
118+ Left e@(HTTP.HttpExceptionRequest _ HTTP.ConnectionFailure{}) -> return $ Left $ DockerConnectionError e
119+#else
117 Left e@HTTP.FailedConnectionException{} -> return $ Left $ DockerConnectionError e
120 Left e@HTTP.FailedConnectionException{} -> return $ Left $ DockerConnectionError e
118 Left e@HTTP.FailedConnectionException2{} -> return $ Left $ DockerConnectionError e
121 Left e@HTTP.FailedConnectionException2{} -> return $ Left $ DockerConnectionError e
122+#endif
119 Left e -> return $ Left $ GenericDockerError (T.pack $ show e)
123 Left e -> return $ Left $ GenericDockerError (T.pack $ show e)
120
124
121-- | Connect to a unix domain socket (the default docker socket is
125-- | Connect to a unix domain socket (the default docker socket is
stack-8.0.2.yamlnew file+4
@@ -0,0 +1,4 @@
1+resolver: lts-9.4
2+packages:
3+- '.'
4+extra-deps: []