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

git.iko.soy/docker-hs

Makes addPortBindings consistent

commit4160f264b53371037a258e500f0b8b44e73f44e4 authorDeni Bertovic <deni@denibertovic.com> dateThu 1 Sep 2016, 22:04 (10 years ago) parent43b5352

3 files changed+6−6

compare with master

unifiedsplit

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

examples/Example.hs+2−2

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

33runNginxContainer :: IO ContainerID

44runNginxContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

55 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"

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

88 case cid of

99 Left err -> error $ show err

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

2121runPostgresContainer :: IO ContainerID

2222runPostgresContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

2323 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"

2525 cid <- createContainer myCreateOpts Nothing

2626 case cid of

2727 Left err -> error $ show err

src/Docker/Client.hs+2−2

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

2222runNginxContainer :: IO ContainerID

2323runNginxContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

2424 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"

2626 cid <- createContainer myCreateOpts

2727 case cid of

2828 Left err -> error $ show err

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

5959runPostgresContainer :: IO ContainerID

6060runPostgresContainer = runDockerT (defaultClientOpts, defaultHttpHandler) $ do

6161 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"

6363 cid <- createContainer myCreateOpts

6464 case cid of

6565 Left err -> error $ show err

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

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

936936--

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

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

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

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

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

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

941941 where hc = hostConfig c

942942 pbs = portBindings $ hostConfig c

943943