git.iko.soy/docker-hs
on master help sign in
Merge pull request #30 from denibertovic/deprecated

Adds #25

commitab9b122833d9a9be2167dc0e95ebf35a216d93dd authorDeni Bertovic <deni@denibertovic.com> dateFri 24 Mar 2017, 15:13 (10 years ago) parent734b9bdbd96554
2 files changed+5−8
compare with master
unifiedsplit
src/Docker/Client/Http.hs+3−3 stack-7.10.yaml+2−5
src/Docker/Client/Http.hs+3−3
@@ -17,7 +17,7 @@ import Data.X509.CertificateStore (makeCertificateStore)
1717import Data.X509.File (readKeyFile, readSignedObject)
1818import Network.HTTP.Client (defaultManagerSettings,
1919 managerRawConnection, method,
20− newManager, parseUrl,
20+ newManager, parseRequest,
2121 requestBody, requestHeaders)
2222import qualified Network.HTTP.Client as HTTP
2323import Network.HTTP.Client.Internal (makeConnection)
@@ -94,7 +94,7 @@ runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
9494mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
9595mkHttpRequest verb e opts = request
9696 where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint (apiVer opts) e)
97− initialR = parseUrl fullE
97+ initialR = parseRequest fullE
9898 request' = case initialR of
9999 Just ir ->
100100 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
@@ -137,7 +137,7 @@ unixHttpHandler fp = do
137137 S.connect s (S.SockAddrUnix filePath)
138138 makeConnection (SBS.recv s 8096)
139139 (SBS.sendAll s)
140− (S.sClose s)
140+ (S.close s)
141141
142142-- TODO:
143143-- Move this to http-client-tls or network?
stack-7.10.yaml+2−5
@@ -1,20 +1,17 @@
11# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
22
33# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4−resolver: lts-5.18
4+resolver: lts-6.30
55
66# Local packages, usually specified by relative directory name
77packages:
88- '.'
99
10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11−extra-deps: [directory-1.2.7.0]
12−
1310# Override default flag values for local packages and extra-deps
1411flags: {}
1512
1613# Extra package databases containing global packages
17−extra-package-dbs: []
14+extra-deps: [directory-1.2.7.0]
1815
1916# Control whether we use the GHC we find on the path
2017# system-ghc: true