diff --git a/src/main/java/com/kpelykh/docker/client/Config.java b/src/main/java/com/kpelykh/docker/client/Config.java index aa029a22..f6e59d76 100644 --- a/src/main/java/com/kpelykh/docker/client/Config.java +++ b/src/main/java/com/kpelykh/docker/client/Config.java @@ -22,16 +22,9 @@ static Config createConfig() throws DockerException { throw new DockerException(e); } - for (String s : new String[]{"url", "version", "username", "password", "email"}) { - final String key = "docker.io." + s; - if (System.getProperties().keySet().contains(key)) { - p.setProperty(key, System.getProperty(key)); - } - } + final File file = new File(System.getProperty("user.home"), ".docker.io.properties"); - final File file = new File(System.getProperty("user.name"), ".docker.io.properties"); - System.out.println(file); - if (file.isFile()) { + if (file.isFile()) { try { final FileInputStream in = new FileInputStream(file); try { @@ -44,6 +37,13 @@ static Config createConfig() throws DockerException { } } + for (String s : new String[]{"url", "version", "username", "password", "email"}) { + final String key = "docker.io." + s; + if (System.getProperties().keySet().contains(key)) { + p.setProperty(key, System.getProperty(key)); + } + } + final Config c = new Config(); c.url = URI.create(p.getProperty("docker.io.url")); diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java index d1070f80..7bba645f 100644 --- a/src/main/java/com/kpelykh/docker/client/DockerClient.java +++ b/src/main/java/com/kpelykh/docker/client/DockerClient.java @@ -108,7 +108,7 @@ public void setCredentials(String username, String password, String email) { } authConfig = new AuthConfig(); authConfig.setUsername(username); - authConfig.setPassword(password); + authConfig.setPassword(password); authConfig.setEmail(email); } diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java index 555842e7..d686f9eb 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java @@ -33,7 +33,7 @@ public class ContainerInspectResponse { private ContainerState state; @JsonProperty("Image") - private String image; + private String imageId; @JsonProperty("NetworkSettings") private NetworkSettings networkSettings; @@ -119,12 +119,12 @@ public void setState(ContainerState state) { this.state = state; } - public String getImage() { - return image; + public String getImageId() { + return imageId; } - public void setImage(String image) { - this.image = image; + public void setImageId(String image) { + this.imageId = image; } public NetworkSettings getNetworkSettings() { diff --git a/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java index a7b4409e..3514670c 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java @@ -22,7 +22,7 @@ public class ImageInspectResponse { @JsonProperty("container_config") private ContainerConfig containerConfig; - @JsonProperty("Size") private int size; + @JsonProperty("Size") private long size; @JsonProperty("docker_version") private String dockerVersion; @@ -76,11 +76,11 @@ public void setContainerConfig(ContainerConfig containerConfig) { this.containerConfig = containerConfig; } - public int getSize() { + public long getSize() { return size; } - public void setSize(int size) { + public void setSize(long size) { this.size = size; } diff --git a/src/test/java/com/kpelykh/docker/client/test/AbstractDockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/AbstractDockerClientTest.java index 8904702e..d8313ca4 100644 --- a/src/test/java/com/kpelykh/docker/client/test/AbstractDockerClientTest.java +++ b/src/test/java/com/kpelykh/docker/client/test/AbstractDockerClientTest.java @@ -30,9 +30,11 @@ public void beforeTest() throws DockerException { LOG.info("Connecting to Docker server at " + url); dockerClient = new DockerClient(url); - LOG.info("Creating image 'busybox'"); + LOG.info("Pulling image 'busybox'"); // need to block until image is pulled completely logResponseStream(dockerClient.pull("busybox")); + + assertNotNull(dockerClient); LOG.info("======================= END OF BEFORETEST =======================\n\n"); diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java index 2267e766..ccf09ea9 100644 --- a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java +++ b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java @@ -151,6 +151,14 @@ public void testImages() throws DockerException { @Test public void testListContainers() throws DockerException { + + String testImage = "hackmann/empty"; + + LOG.info("Pulling image 'hackmann/empty'"); + // need to block until image is pulled completely + logResponseStream(dockerClient.pull(testImage)); + tmpImgs.add(testImage); + List containers = dockerClient.listContainers(true); assertThat(containers, notNullValue()); LOG.info("Container List: {}", containers); @@ -158,18 +166,30 @@ public void testListContainers() throws DockerException { int size = containers.size(); ContainerConfig containerConfig = new ContainerConfig(); - containerConfig.setImage("busybox"); + containerConfig.setImage(testImage); containerConfig.setCmd(new String[] { "echo" }); ContainerCreateResponse container1 = dockerClient .createContainer(containerConfig); + assertThat(container1.getId(), not(isEmptyString())); + + ContainerInspectResponse containerInspectResponse = dockerClient.inspectContainer(container1.getId()); + + assertThat(containerInspectResponse.getConfig().getImage(), is(equalTo(testImage))); + + dockerClient.startContainer(container1.getId()); tmpContainers.add(container1.getId()); LOG.info("container id: " + container1.getId()); - List containers2 = dockerClient.listContainers(true); + List containers2 = dockerClient.listContainers(true); + + for(Container container: containers2) { + LOG.info("listContainer: id=" + container.getId() +" image=" + container.getImage()); + } + assertThat(size + 1, is(equalTo(containers2.size()))); Matcher matcher = hasItem(hasField("id", startsWith(container1.getId()))); assertThat(containers2, matcher); @@ -179,12 +199,12 @@ public void testListContainers() throws DockerException { assertThat(filteredContainers.size(), is(equalTo(1))); for(Container container: filteredContainers) { - LOG.info("container: " + container); + LOG.info("filteredContainer: " + container.getImage()); } Container container2 = filteredContainers.get(0); assertThat(container2.getCommand(), not(isEmptyString())); - assertThat(container2.getImage(), equalTo("busybox:latest")); + assertThat(container2.getImage(), equalTo(testImage + ":latest")); } /* @@ -232,7 +252,7 @@ public void testStartContainer() throws DockerException { assertThat(containerInspectResponse.getId(), startsWith(container.getId())); - assertThat(containerInspectResponse.getImage(), not(isEmptyString())); + assertThat(containerInspectResponse.getImageId(), not(isEmptyString())); assertThat(containerInspectResponse.getState(), is(notNullValue())); assertThat(containerInspectResponse.getState().running, is(true));