Merge pull request #107 from albers/fix-create-withDns

marcuslinke · marcuslinke · commit 0832abcabd2b · 2014-12-04T23:34:07.000+01:00
Fix CreateContainerCmd.withDns()
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -39,7 +39,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("StdinOnce")    private boolean   stdInOnce = false;
     @JsonProperty("Env")          private String[]  env;
     @JsonProperty("Cmd")          private String[]  cmd;
-    @JsonProperty("Dns")          private String[]  dns;
     @JsonProperty("Image")        private String    image;
     @JsonProperty("Volumes")      private Volumes volumes = new Volumes();
     @JsonProperty("VolumesFrom")  private String[]    volumesFrom = new String[]{};
@@ -257,13 +256,13 @@ public CreateContainerCmdImpl withCmd(String... cmd) {
     }
 
     @Override
-	public String[] getDns() {
-        return dns;
+    public String[] getDns() {
+        return hostConfig.getDns();
     }
 
     @Override
-	public CreateContainerCmdImpl withDns(String... dns) {
-        this.dns = dns;
+    public CreateContainerCmdImpl withDns(String... dns) {
+        hostConfig.setDns(dns);
         return this;
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -219,4 +219,25 @@ public void createContainerWithCapAddAndCapDrop() throws DockerException {
 				.getCapDrop()), contains(MKNOD));
 	}
 
+	@Test
+	public void createContainerWithDns() throws DockerException {
+
+		String aDnsServer = "8.8.8.8";
+		String anotherDnsServer = "8.8.4.4";
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+				contains(aDnsServer, anotherDnsServer));
+	}
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -101,18 +101,15 @@ public void startContainerWithDns() throws DockerException {
 
 		CreateContainerResponse container = dockerClient
 				.createContainerCmd("busybox")
-				.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();
+				.withCmd("true").exec();
 
 		LOG.info("Created container {}", container.toString());
 
 		assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
 		dockerClient.startContainerCmd(container.getId()).withDns(aDnsServer, anotherDnsServer).exec();
 
-		inspectContainerResponse = dockerClient.inspectContainerCmd(container
+		InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
 
 		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
