From 4ce9b29d37d0c9aa3353ac60c626f7645ce33cee Mon Sep 17 00:00:00 2001
From: Aldrin Piri <aldrinpiri@gmail.com>
Date: Fri, 22 Aug 2014 23:23:42 -0400
Subject: [PATCH] Adjusting DNS property type to be a String array as specified
 by the Docker Remote API.

---
 .../api/command/InspectContainerResponse.java |  4 +--
 .../api/command/StartContainerCmd.java        |  7 ++---
 .../core/command/StartContainerCmdImpl.java   |  6 ++--
 .../command/StartContainerCmdImplTest.java    | 28 +++++++++++++++++++
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 2f63e5d62..d3375ffc4 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -257,7 +257,7 @@ public class HostConfig {
         private boolean privileged;
 
         @JsonProperty("Dns")
-        private String dns;
+        private String[] dns;
 
         @JsonProperty("VolumesFrom")
         private String[] volumesFrom;
@@ -295,7 +295,7 @@ public boolean isPrivileged() {
 			return privileged;
 		}
 
-		public String getDns() {
+		public String[] getDns() {
 			return dns;
 		}
 
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index 0998ea768..8f0a9d8cf 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -1,14 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import java.util.List;
-
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.SearchItem;
 
 /**
  * Start a container
@@ -27,7 +24,7 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 
 	public boolean isPrivileged();
 
-	public String getDns();
+	public String[] getDns();
 
 	public String getVolumesFrom();
 
@@ -45,7 +42,7 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 
 	public StartContainerCmd withPublishAllPorts(boolean publishAllPorts);
 
-	public StartContainerCmd withDns(String dns);
+	public StartContainerCmd withDns(String... dns);
 
 	public StartContainerCmd withVolumesFrom(String volumesFrom);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 113f9bea2..01b4e1a32 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -44,7 +44,7 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
 	private boolean privileged;
 
 	@JsonProperty("Dns")
-	private String dns;
+	private String[] dns;
 
 	@JsonProperty("VolumesFrom")
 	private String volumesFrom;
@@ -90,7 +90,7 @@ public boolean isPrivileged() {
 	}
 
 	@Override
-	public String getDns() {
+	public String[] getDns() {
 		return dns;
 	}
 
@@ -153,7 +153,7 @@ public StartContainerCmd withPublishAllPorts(boolean publishAllPorts) {
 	}
 
 	@Override
-	public StartContainerCmd withDns(String dns) {
+	public StartContainerCmd withDns(String... dns) {
 		Preconditions.checkNotNull(dns, "dns was not specified");
 		this.dns = dns;
 		return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index ecd04a2ea..847192ca6 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -92,6 +92,34 @@ public void startContainerWithVolumes() throws DockerException {
 		tmpContainers.add(container.getId());
 	}
 
+	@Test
+	public void startContainerWithDns() 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();
+
+		dockerClient.startContainerCmd(container.getId()).withDns(aDnsServer, anotherDnsServer).exec();
+
+		inspectContainerResponse = dockerClient.inspectContainerCmd(container
+				.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+				contains(aDnsServer, anotherDnsServer));
+
+		tmpContainers.add(container.getId());
+	}
+	
 	@Test
 	public void startContainerWithPortBindings() throws DockerException {