From 38091dd3290baff0f80e68530b10c2eaf2a88e59 Mon Sep 17 00:00:00 2001 From: mcarr Date: Tue, 19 Nov 2013 16:10:34 -0800 Subject: [PATCH] makes changed for 1.6 --- pom.xml | 2 +- .../java/com/kpelykh/docker/client/DockerClient.java | 2 +- .../com/kpelykh/docker/client/model/Container.java | 2 +- .../kpelykh/docker/client/model/ContainerConfig.java | 10 ++++++++++ .../docker/client/model/ContainerInspectResponse.java | 6 ++++++ .../kpelykh/docker/client/test/DockerClientTest.java | 7 ++++--- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c48199e8..39df35fa 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.kpelykh docker-java jar - 0.6.1-SNAPSHOT + 0.7.0-SNAPSHOT docker-java https://github.com/kpelykh/docker-java diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java index e155f53b..3f912718 100644 --- a/src/main/java/com/kpelykh/docker/client/DockerClient.java +++ b/src/main/java/com/kpelykh/docker/client/DockerClient.java @@ -47,7 +47,7 @@ public class DockerClient private String restEndpointUrl; public DockerClient(String serverUrl) { - restEndpointUrl = serverUrl + "/v1.3"; + restEndpointUrl = serverUrl + "/v1.6"; ClientConfig clientConfig = new DefaultClientConfig(); clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); diff --git a/src/main/java/com/kpelykh/docker/client/model/Container.java b/src/main/java/com/kpelykh/docker/client/model/Container.java index cef2d3b6..a33f060d 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Container.java +++ b/src/main/java/com/kpelykh/docker/client/model/Container.java @@ -25,7 +25,7 @@ public class Container { public String status; @JsonProperty("Ports") - public String ports; //Example value "49164->6900, 49165->7100" + public String[] ports; //Example value "49164->6900, 49165->7100" @JsonProperty("SizeRw") public int size; diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java b/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java index af79ff20..3bf561fe 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java @@ -34,6 +34,7 @@ public class ContainerConfig { @JsonProperty("NetworkDisabled") private boolean networkDisabled = false; @JsonProperty("Privileged") private boolean privileged = false; @JsonProperty("WorkingDir") private String workingDir = ""; + @JsonProperty("Domainname") private String domainName = ""; public String getWorkingDir() { @@ -212,6 +213,14 @@ public void setEntrypoint(String[] entrypoint) { this.entrypoint = entrypoint; } + public String getDomainName() { + return domainName; + } + + public void setDomainName(String domainName) { + this.domainName = domainName; + } + @Override public String toString() { return "ContainerConfig{" + @@ -234,6 +243,7 @@ public String toString() { ", volumes=" + volumes + ", volumesFrom='" + volumesFrom + '\'' + ", entrypoint='" + Arrays.toString(portSpecs) + + ", domainName='" + domainName + '}'; } } 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 b3ec431e..a01ba3f5 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java @@ -25,6 +25,8 @@ public class ContainerInspectResponse { @JsonProperty("ResolvConfPath") public String resolvConfPath; @JsonProperty("Volumes") public Map volumes; @JsonProperty("VolumesRW") public Map volumesRW; + @JsonProperty("HostnamePath") public String hostnamePath; + @JsonProperty("HostsPath") public String hostsPath; @Override public String toString() { @@ -41,6 +43,8 @@ public String toString() { ", state=" + state + ", image='" + image + '\'' + ", networkSettings=" + networkSettings + + ", hostnamePath=" + hostnamePath + + ", hostsPath=" + hostsPath + '}'; } @@ -59,6 +63,7 @@ public class ContainerState { @JsonProperty("Pid") public int pid; @JsonProperty("ExitCode") public int exitCode; @JsonProperty("StartedAt") public String startedAt; + @JsonProperty("FinishedAt") public String finishedAt; @JsonProperty("Ghost") public boolean ghost; @Override @@ -68,6 +73,7 @@ public String toString() { ", pid=" + pid + ", exitCode=" + exitCode + ", startedAt='" + startedAt + '\'' + + ", finishedAt='" + finishedAt + '\'' + ", ghost=" + ghost + '}'; } 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 ca37013b..abe12221 100644 --- a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java +++ b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java @@ -46,7 +46,7 @@ public class DockerClientTest extends Assert public void beforeTest() throws DockerException { LOG.info("======================= BEFORETEST ======================="); LOG.info("Connecting to Docker server at http://localhost:4243"); - dockerClient = new DockerClient("http://localhost:4243"); + dockerClient = new DockerClient("http://mcarrsbx:4243"); LOG.info("Creating image 'busybox'"); dockerClient.pull("busybox"); @@ -305,7 +305,8 @@ public void testLogs() throws DockerException, IOException { String fullLog = logwriter.toString(); LOG.info("Container log: " + fullLog); - assertThat(fullLog, equalTo(snippet)); + //assertThat(fullLog, equalTo(snippet)); + assertThat(fullLog,containsString(snippet)); } @Test @@ -764,6 +765,6 @@ private void dockerfileBuild(File baseDir, String expectedText) throws DockerExc IOUtils.closeQuietly(logResponse.getEntityInputStream()); } - assertThat(logwriter2.toString(), equalTo(expectedText)); + assertThat(logwriter2.toString(), containsString(expectedText)); } } \ No newline at end of file