Fix for Issue#54 Missing DnsSearch Option

Marcus Linke · Marcus Linke · commit 0abdfebe4e46 · 2014-09-17T19:47:42.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 
+// https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
 
 	public AuthConfig authConfig() throws DockerException;
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import java.io.InputStream;
-
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -254,16 +254,16 @@ public class HostConfig {
 
         @JsonProperty("Dns")
         private String[] dns;
+        
+        @JsonProperty("DnsSearch")
+        private String[] dnsSearch;
 
         @JsonProperty("VolumesFrom")
         private String[] volumesFrom;
 
         @JsonProperty("ContainerIDFile")
         private String containerIDFile;
 
-        @JsonProperty("DnsSearch")
-        private String dnsSearch;
-
         // TODO: use Links class here?
         @JsonProperty("Links")
         private String[] links;
@@ -315,7 +315,7 @@ public String getContainerIDFile() {
 			return containerIDFile;
 		}
 
-		public String getDnsSearch() {
+		public String[] getDnsSearch() {
 			return dnsSearch;
 		}
 
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -27,6 +27,8 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 	public boolean isPrivileged();
 
 	public String[] getDns();
+	
+	public String[] getDnsSearch();
 
 	public String getVolumesFrom();
 
@@ -54,7 +56,11 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 
 	public StartContainerCmd withPublishAllPorts(boolean publishAllPorts);
 
+	// Set custom DNS servers
 	public StartContainerCmd withDns(String... dns);
+	
+	// Set custom DNS search domains
+	public StartContainerCmd withDnsSearch(String... dnsSearch);
 
 	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
@@ -44,6 +44,9 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
 
 	@JsonProperty("Dns")
 	private String[] dns;
+	
+	@JsonProperty("DnsSearch")
+	private String[] dnsSearch;
 
 	@JsonProperty("VolumesFrom")
 	private String volumesFrom;
@@ -104,6 +107,11 @@ public boolean isPrivileged() {
 	public String[] getDns() {
 		return dns;
 	}
+	
+	@Override
+	public String[] getDnsSearch() {
+		return dnsSearch;
+	}
 
 	@Override
 	public String getVolumesFrom() {
@@ -189,6 +197,13 @@ public StartContainerCmd withDns(String... dns) {
 		this.dns = dns;
 		return this;
 	}
+	
+	@Override
+	public StartContainerCmd withDnsSearch(String... dnsSearch) {
+		Preconditions.checkNotNull(dnsSearch, "dnsSearch was not specified");
+		this.dnsSearch = dnsSearch;
+		return this;
+	}
 
 	@Override
 	public StartContainerCmd withVolumesFrom(String volumesFrom) {
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -114,7 +114,31 @@ public void startContainerWithDns() throws DockerException {
 
 		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
 				contains(aDnsServer, anotherDnsServer));
+	}
+	
+	@Test
+	public void startContainerWithDnsSearch() throws DockerException {
+
+		String dnsSearch = "example.com";
+		
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.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()).withDnsSearch(dnsSearch).exec();
+
+		inspectContainerResponse = dockerClient.inspectContainerCmd(container
+				.getId()).exec();
 
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDnsSearch()),
+				contains(dnsSearch));
 	}
 	
 	@Test
