@@ -89,11 +89,17 @@ testBuildFromDockerfile = do
89 r <- buildImageFromDockerfile (defaultBuildOpts "docker-hs/dockerfile-test") ctxDir
89 r <- buildImageFromDockerfile (defaultBuildOpts "docker-hs/dockerfile-test") ctxDir
90 lift $ assert $ isRight r
90 lift $ assert $ isRight r
92testRunAndReadLog :: IO ()
93testRunAndReadLog :: IO ()
93−testRunAndReadLog =
94+testRunAndReadLog = testRunAndReadLogHelper $ NetworkingConfig HM.empty
96+testRunAndReadLogWithNetworking :: IO ()
97+testRunAndReadLogWithNetworking = testRunAndReadLogHelper $ NetworkingConfig $ HM.fromList [("test-network", EndpointConfig ["cellar-door"])]
99+testRunAndReadLogHelper :: NetworkingConfig -> IO ()
100+testRunAndReadLogHelper networkingConfig =
94 runDocker $
101 runDocker $
95 do let containerConfig = (defaultContainerConfig (testImageName <> ":latest")) {env = [EnvVar "TEST" "123"]}
102 do let containerConfig = (defaultContainerConfig (testImageName <> ":latest")) {env = [EnvVar "TEST" "123"]}
96− networkingConfig = NetworkingConfig $ HM.fromList [("test-network", EndpointConfig ["cellar-door"])]
97 containerId <- createContainer (CreateOpts containerConfig defaultHostConfig networkingConfig) Nothing
103 containerId <- createContainer (CreateOpts containerConfig defaultHostConfig networkingConfig) Nothing
98 c <- fromRight containerId
104 c <- fromRight containerId
99 status1 <- startContainer defaultStartOpts c
105 status1 <- startContainer defaultStartOpts c
@@ -209,6 +215,7 @@ integrationTests =
209 , testCase "Find image by name" testFindImage
215 , testCase "Find image by name" testFindImage
210 , testCase "List containers" testListContainers
216 , testCase "List containers" testListContainers
211 , testCase "Run a dummy container and read its log" testRunAndReadLog
217 , testCase "Run a dummy container and read its log" testRunAndReadLog
218+ , testCase "Run a dummy container with networking and read its log" testRunAndReadLogWithNetworking
212 , testCase "Try to stop a container that doesn't exist" testStopNonexisting
219 , testCase "Try to stop a container that doesn't exist" testStopNonexisting