Add support for configuring ExtraHosts

kalmanb · kalmanb · commit 126fae13e1b8 · 2015-02-19T15:20:37.000+13:00
Extends HostConfig to support adding entries to /etc/hosts on startup.
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -53,12 +53,16 @@ public class HostConfig {
 	@JsonProperty("Devices")
 	private Device[] devices;
 
+	@JsonProperty("ExtraHosts")
+	private String[] extraHosts;
+
 	public HostConfig() {
 	}
 
 	public HostConfig(String[] binds, Links links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
 			boolean privileged, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
-			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices) {
+			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
+            String[] extraHosts) {
 		this.binds = binds;
 		this.links = links;
 		this.lxcConf = lxcConf;
@@ -74,6 +78,7 @@ public HostConfig(String[] binds, Links links, LxcConf[] lxcConf, Ports portBind
 		this.restartPolicy = restartPolicy;
 		this.networkMode = networkMode;
 		this.devices = devices;
+		this.extraHosts = extraHosts;
 	}
 
 	public String[] getBinds() {
@@ -124,6 +129,10 @@ public Device[] getDevices() {
 		return devices;
 	}
 
+	public String[] getExtraHosts() {
+		return extraHosts;
+	}
+
 	public RestartPolicy getRestartPolicy() {
 		return restartPolicy;
 	}
@@ -196,6 +205,10 @@ public void setDevices(Device[] devices) {
 		this.devices = devices;
 	}
 
+	public void setExtraHosts(String[] extraHosts) {
+		this.extraHosts = extraHosts;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(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
@@ -311,4 +311,27 @@ public void createContainerWithEntrypoint() throws DockerException {
 
 	}
 
+	@Test
+	public void createContainerWithExtraHosts() throws DockerException {
+
+		String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
+
+		HostConfig hostConfig = new HostConfig();
+		hostConfig.setExtraHosts(extraHosts);
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox").withName("container")
+				.withHostConfig(hostConfig).exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+				containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
+	}
+
 }
