@@ -17,7 +17,7 @@ import Data.X509.CertificateStore (makeCertificateStore)
17import Data.X509.File (readKeyFile, readSignedObject)
17import Data.X509.File (readKeyFile, readSignedObject)
18import Network.HTTP.Client (defaultManagerSettings,
18import Network.HTTP.Client (defaultManagerSettings,
19 managerRawConnection, method,
19 managerRawConnection, method,
20− newManager, parseUrl,
20+ newManager, parseUrlThrow,
21 requestBody, requestHeaders)
21 requestBody, requestHeaders)
22import qualified Network.HTTP.Client as HTTP
22import qualified Network.HTTP.Client as HTTP
23import Network.HTTP.Client.Internal (makeConnection)
23import Network.HTTP.Client.Internal (makeConnection)
@@ -94,7 +94,7 @@ runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
94mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
94mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
95mkHttpRequest verb e opts = request
95mkHttpRequest verb e opts = request
96 where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint (apiVer opts) e)
96 where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint (apiVer opts) e)
97− initialR = parseUrl fullE
97+ initialR = parseUrlThrow fullE
98 request' = case initialR of
98 request' = case initialR of
99 Just ir ->
99 Just ir ->
100 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
100 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
@@ -137,7 +137,7 @@ unixHttpHandler fp = do
137 S.connect s (S.SockAddrUnix filePath)
137 S.connect s (S.SockAddrUnix filePath)
138 makeConnection (SBS.recv s 8096)
138 makeConnection (SBS.recv s 8096)
139 (SBS.sendAll s)
139 (SBS.sendAll s)
140− (S.sClose s)
140+ (S.close s)
143-- Move this to http-client-tls or network?
143-- Move this to http-client-tls or network?