@@ -14,7 +14,7 @@ import Data.X509.CertificateStore (makeCertificateStore)
14import Data.X509.File (readKeyFile, readSignedObject)
14import Data.X509.File (readKeyFile, readSignedObject)
15import Network.HTTP.Client (defaultManagerSettings, httpLbs,
15import Network.HTTP.Client (defaultManagerSettings, httpLbs,
16 managerRawConnection, method,
16 managerRawConnection, method,
17− newManager, parseUrl,
17+ newManager, parseUrlThrow,
18 requestBody, requestHeaders)
18 requestBody, requestHeaders)
19import qualified Network.HTTP.Client as HTTP
19import qualified Network.HTTP.Client as HTTP
20import Network.HTTP.Client.Internal (makeConnection)
20import Network.HTTP.Client.Internal (makeConnection)
@@ -85,7 +85,7 @@ runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
85mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
85mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
86mkHttpRequest verb e opts = request
86mkHttpRequest verb e opts = request
87 where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint e)
87 where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint e)
88− initialR = parseUrl fullE
88+ initialR = parseUrlThrow fullE
89 request' = case initialR of
89 request' = case initialR of
90 Just ir ->
90 Just ir ->
91 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
91 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
@@ -127,7 +127,7 @@ unixHttpHandler fp request = do
127 S.connect s (S.SockAddrUnix filePath)
127 S.connect s (S.SockAddrUnix filePath)
128 makeConnection (SBS.recv s 8096)
128 makeConnection (SBS.recv s 8096)
129 (SBS.sendAll s)
129 (SBS.sendAll s)
130− (S.sClose s)
130+ (S.close s)
133-- Move this to http-client-tls or network?
133-- Move this to http-client-tls or network?