From 7af8f8f4eacb13bd4de09dfaf14b8dffc63d733c Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 17:06:05 +0300 Subject: [PATCH 1/7] Fix body request for jersey. --- .../github/dockerjava/jaxrs/StartContainerCmdExec.java | 10 +++++----- .../dockerjava/netty/exec/StartContainerCmdExec.java | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java index 0f75c4f2f..2851a26c7 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java +++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java @@ -1,7 +1,5 @@ package com.github.dockerjava.jaxrs; -import static javax.ws.rs.client.Entity.entity; - import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; @@ -22,11 +20,13 @@ public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCl @Override protected Void execute(StartContainerCmd command) { - WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id", - command.getContainerId()); + WebTarget webResource = getBaseResource().path("/containers/{id}/start") + .resolveTemplate("id", command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON)) + webResource.request() + .accept(MediaType.APPLICATION_JSON) + .post(null) .close(); return null; diff --git a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java index 12f2d8cbc..039006f2d 100644 --- a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java +++ b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java @@ -23,7 +23,9 @@ protected Void execute(StartContainerCmd command) { command.getContainerId()); LOGGER.trace("POST: {}", webResource); - webResource.request().accept(MediaType.APPLICATION_JSON).post(command); + webResource.request() + .accept(MediaType.APPLICATION_JSON) + .post(command); return null; } From 8a3108fbb5cd844fff8e7eaef4bf509fe8299227 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 17:29:57 +0300 Subject: [PATCH 2/7] Fix integration tests --- .../get-docker-com.sh | 2 +- .travis/travis-before-install.sh | 53 +++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) rename get-docker-com.sh => .travis/get-docker-com.sh (99%) diff --git a/get-docker-com.sh b/.travis/get-docker-com.sh similarity index 99% rename from get-docker-com.sh rename to .travis/get-docker-com.sh index 66ca4aefc..d9c0142a2 100755 --- a/get-docker-com.sh +++ b/.travis/get-docker-com.sh @@ -310,4 +310,4 @@ do_install() { # wrapped up in a function so that we have some protection against only getting # half the file during "curl | sh" -do_install \ No newline at end of file +do_install diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh index 13034fc74..6935f7a7d 100755 --- a/.travis/travis-before-install.sh +++ b/.travis/travis-before-install.sh @@ -3,6 +3,7 @@ sudo apt-get install -y -q ca-certificates +export HOST_PORT=2375 echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt @@ -21,7 +22,10 @@ sudo -E apt-get install -q -y wget sudo -E apt-get -q -y --purge remove docker-engine sudo -E apt-cache policy docker-engine -./get-docker-com.sh +./.travis/get-docker-com.sh + +sudo -E stop docker + #mkdir "${HOME}/.cache" || : #pushd "${HOME}/.cache" # wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb" @@ -31,10 +35,49 @@ sudo -E apt-cache policy docker-engine #rm -f "src/test/resources/logback.xml" mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml" -echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker -sudo -E restart docker -sleep 10 -docker version +# https://github.com/docker/docker/issues/18113 +sudo rm /var/lib/docker/network/files/local-kv.db + +sudo cat /etc/default/docker + +cat << EOF | sudo tee /etc/default/docker +DOCKER_OPTS="\ +--dns 8.8.8.8 \ +--dns 8.8.4.4 \ +-D \ +-H=unix:///var/run/docker.sock \ +-H=tcp://0.0.0.0:${HOST_PORT} \ +" +EOF + +sudo cat /etc/default/docker +sudo bash -c ':> /var/log/upstart/docker.log' + +date +sudo -E start docker + +tries=20 +sleep=5 +for i in $(seq 1 $tries); do + if sudo grep "API listen on" /var/log/upstart/docker.log ; then + echo "Docker started. Delay $(($i * $sleep))" + break + elif [[ $i -ge $tries ]]; then + echo "Docker didn't start. Exiting!" + sudo cat /var/log/upstart/docker.log + exit 1 + else + echo "Docker didn't start, sleeping for 5 secs..." + sleep $sleep + fi +done + + +sudo ss -antpl + +curl -V + +docker version || sudo cat /var/log/upstart/docker.log docker info set +u From 699080417ae678d77da5b46ef39a36810d620329 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 21:30:49 +0300 Subject: [PATCH 3/7] Fix network test. --- .../command/ConnectToNetworkCmdImplTest.java | 40 ++++++++++++------ .../exec/ConnectToNetworkCmdExecTest.java | 41 +++++++++++++------ 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java index 84bb59a81..207d2a0d5 100644 --- a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java @@ -3,6 +3,7 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.ContainerNetwork; import com.github.dockerjava.api.model.Network; import com.github.dockerjava.client.AbstractDockerClientTest; @@ -16,6 +17,10 @@ import java.lang.reflect.Method; import java.util.Collections; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + @Test(groups = "integration") public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest { @@ -60,38 +65,49 @@ public void connectToNetwork() throws InterruptedException { @Test public void connectToNetworkWithContainerNetwork() throws InterruptedException { + final String NETWORK_SUBNET = "10.100.102.0/24"; + final String NETWORK_NAME = "jerseyTestNetwork"; + final String CONTAINER_IP = "10.100.102.100"; + + CreateContainerResponse container = dockerClient.createContainerCmd("busybox") + .withCmd("sleep", "9999") + .exec(); - CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec(); dockerClient.startContainerCmd(container.getId()).exec(); + try { + dockerClient.removeNetworkCmd(NETWORK_NAME).exec(); + } catch (DockerException ignore) { + } + CreateNetworkResponse network = dockerClient.createNetworkCmd() - .withName("testNetwork") + .withName(NETWORK_NAME) .withIpam(new Network.Ipam() - .withConfig(new Network.Ipam.Config() - .withSubnet("10.100.100.0/24"))) + .withConfig(new Network.Ipam.Config() + .withSubnet(NETWORK_SUBNET))) .exec(); dockerClient.connectToNetworkCmd() .withNetworkId(network.getId()) .withContainerId(container.getId()) .withContainerNetwork(new ContainerNetwork() - .withAliases("testing") - .withIpamConfig(new ContainerNetwork.Ipam() - .withIpv4Address("10.100.100.100"))) + .withAliases("aliasName") + .withIpamConfig(new ContainerNetwork.Ipam() + .withIpv4Address(CONTAINER_IP))) .exec(); Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec(); Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId()); assertNotNull(containerNetworkConfig); - assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24"); + assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24")); InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); - ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"); + ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME); assertNotNull(testNetwork); - assertEquals(testNetwork.getAliases(), Collections.singletonList("testing")); - assertEquals(testNetwork.getGateway(), "10.100.100.1"); - assertEquals(testNetwork.getIpAddress(), "10.100.100.100"); + assertThat(testNetwork.getAliases(), hasItem("aliasName")); + assertEquals(testNetwork.getGateway(), "10.100.102.1"); + assertEquals(testNetwork.getIpAddress(), CONTAINER_IP); } } diff --git a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java index ee1a681b6..7e290a98e 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java @@ -3,6 +3,8 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateNetworkResponse; import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.exception.DockerException; +import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.ContainerNetwork; import com.github.dockerjava.api.model.Network; import com.github.dockerjava.netty.AbstractNettyDockerClientTest; @@ -17,6 +19,10 @@ import java.lang.reflect.Method; import java.util.Collections; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + @Test(groups = "integration") public class ConnectToNetworkCmdExecTest extends AbstractNettyDockerClientTest { @@ -61,38 +67,49 @@ public void connectToNetwork() throws InterruptedException { @Test public void connectToNetworkWithContainerNetwork() throws InterruptedException { + final String NETWORK_SUBNET = "10.100.101.0/24"; + final String NETWORK_NAME = "nettyTestNetwork"; + final String CONTAINER_IP = "10.100.101.100"; + + CreateContainerResponse container = dockerClient.createContainerCmd("busybox") + .withCmd("sleep", "9999") + .exec(); - CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec(); dockerClient.startContainerCmd(container.getId()).exec(); + try { + dockerClient.removeNetworkCmd(NETWORK_NAME).exec(); + } catch (DockerException ignore) { + } + CreateNetworkResponse network = dockerClient.createNetworkCmd() - .withName("testNetwork") + .withName(NETWORK_NAME) .withIpam(new Network.Ipam() - .withConfig(new Network.Ipam.Config() - .withSubnet("10.100.100.0/24"))) + .withConfig(new Network.Ipam.Config() + .withSubnet(NETWORK_SUBNET))) .exec(); dockerClient.connectToNetworkCmd() .withNetworkId(network.getId()) .withContainerId(container.getId()) .withContainerNetwork(new ContainerNetwork() - .withAliases("testing") - .withIpamConfig(new ContainerNetwork.Ipam() - .withIpv4Address("10.100.100.100"))) + .withAliases("aliasName") + .withIpamConfig(new ContainerNetwork.Ipam() + .withIpv4Address(CONTAINER_IP))) .exec(); Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec(); Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId()); assertNotNull(containerNetworkConfig); - assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24"); + assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24")); InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); - ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"); + ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME); assertNotNull(testNetwork); - assertEquals(testNetwork.getAliases(), Collections.singletonList("testing")); - assertEquals(testNetwork.getGateway(), "10.100.100.1"); - assertEquals(testNetwork.getIpAddress(), "10.100.100.100"); + assertThat(testNetwork.getAliases(), hasItem("aliasName")); + assertEquals(testNetwork.getGateway(), "10.100.101.1"); + assertEquals(testNetwork.getIpAddress(), CONTAINER_IP); } } From a68cf85da7918886c669e7ddc92e6c246046a4ea Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 21:33:15 +0300 Subject: [PATCH 4/7] Fix create with alias tests. --- .../dockerjava/core/command/CreateContainerCmdImplTest.java | 2 +- .../dockerjava/netty/exec/CreateContainerCmdExecTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java index 7babafc91..1f62527e9 100644 --- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java @@ -375,7 +375,7 @@ public void createContainerWithAlias() throws DockerException { .exec(); ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet"); - assertEquals(aliasNet.getAliases(), Collections.singletonList("server")); + assertThat(aliasNet.getAliases(), hasItem("server")); } @Test diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java index 2213ca7b7..3694ca7fb 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java @@ -370,7 +370,7 @@ public void createContainerWithAlias() throws DockerException { .exec(); ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet"); - assertEquals(aliasNet.getAliases(), Collections.singletonList("server")); + assertThat(aliasNet.getAliases(), hasItem("server")); } @Test From af891e25521d6b09f0213f458be256933caded06 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 21:38:58 +0300 Subject: [PATCH 5/7] Fix test for 1.24 --- src/main/java/com/github/dockerjava/api/DockerClient.java | 1 + .../core/command/CopyFileFromContainerCmdImplTest.java | 8 ++++++++ .../netty/exec/CopyFileFromContainerCmdExecTest.java | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java index 491c11ac8..832890e87 100644 --- a/src/main/java/com/github/dockerjava/api/DockerClient.java +++ b/src/main/java/com/github/dockerjava/api/DockerClient.java @@ -170,6 +170,7 @@ public interface DockerClient extends Closeable { * @return created command * @see #copyArchiveFromContainerCmd(String, String) * @deprecated since docker API version 1.20, replaced by {@link #copyArchiveFromContainerCmd(String, String)} + * since 1.24 fails. */ @Deprecated CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource); diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java index 8bd2c44fe..ec66287eb 100644 --- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java @@ -1,5 +1,6 @@ package com.github.dockerjava.core.command; +import static com.github.dockerjava.utils.TestUtils.getVersion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; @@ -7,7 +8,10 @@ import java.io.InputStream; import java.lang.reflect.Method; +import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.utils.TestUtils; import org.testng.ITestResult; +import org.testng.SkipException; import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeMethod; @@ -43,6 +47,10 @@ public void afterMethod(ITestResult result) { @Test public void copyFromContainer() throws Exception { + if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) { + throw new SkipException("Doesn't work since 1.24"); + } + // TODO extract this into a shared method CreateContainerResponse container = dockerClient.createContainerCmd("busybox") .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec(); diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java index b512cfa69..1060ae82a 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java @@ -1,5 +1,6 @@ package com.github.dockerjava.netty.exec; +import static com.github.dockerjava.utils.TestUtils.getVersion; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; @@ -7,7 +8,9 @@ import java.io.InputStream; import java.lang.reflect.Method; +import com.github.dockerjava.core.RemoteApiVersion; import org.testng.ITestResult; +import org.testng.SkipException; import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeMethod; @@ -43,6 +46,10 @@ public void afterMethod(ITestResult result) { @Test public void copyFromContainer() throws Exception { + if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) { + throw new SkipException("Doesn't work since 1.24"); + } + // TODO extract this into a shared method CreateContainerResponse container = dockerClient.createContainerCmd("busybox") .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec(); From 78a2a007303f93211fca4398198f977cf4bba173 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Sun, 14 Aug 2016 21:39:09 +0300 Subject: [PATCH 6/7] Fix typo --- .../com/github/dockerjava/core/command/UnpauseCmdImplTest.java | 2 +- .../com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java | 2 +- src/test/java/com/github/dockerjava/utils/ContainerUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java index f640c4182..2f41b67ae 100644 --- a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java @@ -56,7 +56,7 @@ public void unpausePausedContainer() { ContainerUtils.pauseContainer(dockerClient, container); - ContainerUtils.unpaseContainer(dockerClient, container); + ContainerUtils.unpauseContainer(dockerClient, container); } @Test(expectedExceptions = InternalServerErrorException.class) diff --git a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java index db91bc9f9..cb30babc4 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java @@ -56,7 +56,7 @@ public void unpausePausedContainer() { ContainerUtils.pauseContainer(dockerClient, container); - ContainerUtils.unpaseContainer(dockerClient, container); + ContainerUtils.unpauseContainer(dockerClient, container); } @Test(expectedExceptions = InternalServerErrorException.class) diff --git a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java index 75be6c4d9..206be0693 100644 --- a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java +++ b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java @@ -60,7 +60,7 @@ public static void stopContainer(DockerClient dockerClient, CreateContainerRespo * @param dockerClient docker client * @param container container */ - public static void unpaseContainer(DockerClient dockerClient, CreateContainerResponse container) { + public static void unpauseContainer(DockerClient dockerClient, CreateContainerResponse container) { dockerClient.unpauseContainerCmd(container.getId()).exec(); InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec(); From a520aaa56b0e8cb05dc7a84da7b04377418c2f55 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 15 Aug 2016 00:35:48 +0300 Subject: [PATCH 7/7] Fix test again? --- .../dockerjava/netty/exec/AttachContainerCmdExecTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java index 7daa59b25..d3e8094cf 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java @@ -93,7 +93,7 @@ public void attachContainerWithStdin() throws Exception { dockerClient.startContainerCmd(container.getId()).exec(); - Thread.sleep(SECONDS.toMillis(3)); //wait bash initialisation + Thread.sleep(SECONDS.toMillis(10)); //wait bash initialisation InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();