4160f26 · docker-hs · git.iko.soy

examples/Example.hs+2−2

compare with master

unifiedsplit

@@ -3,7 +3,7 @@ import Docker.Client

3runNginxContainer :: IO ContainerID

4runNginxContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

5 let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]

6− let myCreateOpts = addPortBinding (defaultCreateOpts "nginx:latest") pb

6+ let myCreateOpts = addPortBinding pb $ defaultCreateOpts "nginx:latest"

7 cid <- createContainer myCreateOpts (Just "myNginxContainer")

8 case cid of

9 Left err -> error $ show err

@@ -21,7 +21,7 @@ stopNginxContainer cid = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

21runPostgresContainer :: IO ContainerID

22runPostgresContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

23 let pb = PortBinding 5432 TCP [HostPort "0.0.0.0" 5432]

24− let myCreateOpts = addBinds [Bind "/tmp" "/tmp" Nothing] $ addPortBinding (defaultCreateOpts "postgres:9.5") pb

24+ let myCreateOpts = addBinds [Bind "/tmp" "/tmp" Nothing] $ addPortBinding pb $ defaultCreateOpts "postgres:9.5"

25 cid <- createContainer myCreateOpts Nothing

26 case cid of

27 Left err -> error $ show err

src/Docker/Client.hs+2−2

@@ -22,7 +22,7 @@ import Docker.Client

22runNginxContainer :: IO ContainerID

23runNginxContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

24 let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]

25− let myCreateOpts = addPortBinding (defaultCreateOpts "nginx:latest") pb

25+ let myCreateOpts = addPortBinding pb $ defaultCreateOpts "nginx:latest"

26 cid <- createContainer myCreateOpts

27 case cid of

28 Left err -> error $ show err

@@ -59,7 +59,7 @@ persist on the host file system.

59runPostgresContainer :: IO ContainerID

60runPostgresContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

61 let pb = PortBinding 5432 TCP [HostPort "0.0.0.0" 5432]

62− let myCreateOpts = addBinds [Bind "\/tmp" "\/tmp" Nothing] $ addPortBinding (defaultCreateOpts "postgres:9.5") pb

62+ let myCreateOpts = addBinds [Bind "\/tmp" "\/tmp" Nothing] $ addPortBinding pb $ defaultCreateOpts "postgres:9.5"

63 cid <- createContainer myCreateOpts

64 case cid of

65 Left err -> error $ show err

src/Docker/Client/Types.hs+2−2

@@ -936,8 +936,8 @@ addBinds bs c = c{hostConfig=hc{binds=bs}}

936--

937-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]

938-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb

939−addPortBinding :: CreateOpts -> PortBinding -> CreateOpts

939+addPortBinding :: PortBinding -> CreateOpts -> CreateOpts

940−addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}

940+addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}

941 where hc = hostConfig c

942 pbs = portBindings $ hostConfig c

943