git.iko.soy/docker-hs
on master help sign in
Merge pull request #35 from jprider63/master

#34 w/ backwards compatibility

commitd1ec27aaee752ec4e77ddc0649a7c2695eee392f authorDeni Bertovic <deni@denibertovic.com> dateFri 22 Sep 2017, 18:09 (9 years ago) parent6e19bc8630d490
5 files changed+20−8
compare with master
unifiedsplit
.travis.yml+1 CHANGELOG.md+4−1 docker.cabal+7−7 src/Docker/Client/Http.hs+4 stack-8.0.2.yaml+4
.travis.yml+1
@@ -24,6 +24,7 @@ services:
2424env:
2525 - GHCVER=7.10 STACK_ARGS=""
2626 - GHCVER=8.0 STACK_ARGS=""
27+ - GHCVER=8.0.2 STACK_ARGS=""
2728
2829addons:
2930 apt:
CHANGELOG.md+4−1
@@ -1,5 +1,9 @@
11# CHANGELOG
22
3+## 0.4.0.2 (2017-09-19)
4+
5+- Support LTS 9.4
6+
37## 0.4.0.1 (2017-06-29)
48
59- fixes omKillDisable parsing from json
@@ -13,7 +17,6 @@
1317- Added support for streaming log output
1418- Added support for pulling images from the hub (and streaming the output)
1519
16−
1720## 0.3.0.1 (2016-09-07)
1821
1922- Small cosmetic changes and marking OVERLAPPING instance
docker.cabal+7−7
@@ -1,5 +1,5 @@
11name: docker
2−version: 0.4.0.1
2+version: 0.4.0.2
33synopsis: An API client for docker written in Haskell
44description: See API documentation below.
55homepage: https://github.com/denibertovic/docker-hs
@@ -15,17 +15,17 @@ cabal-version: >=1.10
1515stability: experimental
1616
1717library
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
1919 hs-source-dirs: src
2020 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
2121 -- other-modules: Docker.Internal
2222 build-depends: base >= 4.7 && < 5
23− , aeson >= 0.9.0 && < 1.1.0
23+ , aeson >= 0.9.0 && < 1.2.0
2424 , blaze-builder >= 0.4.0 && < 0.5.0
2525 , bytestring >= 0.10.0 && < 0.11.0
2626 , containers >= 0.5.0 && < 0.6.0
2727 , 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
2929 , http-types >= 0.9 && < 0.10.0
3030 , vector
3131 , conduit
@@ -51,9 +51,9 @@ library
5151 , scientific >= 0.3.0 && < 0.4.0
5252 , tls >= 1.3.7 && < 1.4.0
5353 , unordered-containers >= 0.2.0 && < 0.3.0
54− , x509 >= 1.6.0 && < 1.7.0
55− , x509-store >= 1.6.0 && < 1.7.0
56− , x509-system >= 1.6.0 && < 1.7.0
54+ , x509 >= 1.6.0 && < 1.8.0
55+ , x509-store >= 1.6.0 && < 1.8.0
56+ , x509-system >= 1.6.0 && < 1.8.0
5757 default-language: Haskell2010
5858 ghc-options: -Wall -fno-warn-name-shadowing
5959
src/Docker/Client/Http.hs+4
@@ -114,8 +114,12 @@ httpHandler manager = HttpHandler $ \request' sink -> do -- runResourceT ..
114114 let request = NHS.setRequestManager manager request'
115115 try (NHS.httpSink request sink) >>= \res -> case res of
116116 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
117120 Left e@HTTP.FailedConnectionException{} -> return $ Left $ DockerConnectionError e
118121 Left e@HTTP.FailedConnectionException2{} -> return $ Left $ DockerConnectionError e
122+#endif
119123 Left e -> return $ Left $ GenericDockerError (T.pack $ show e)
120124
121125-- | 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: []