From 7ba545d24f4876913cda705e7af5033bb80bb7c3 Mon Sep 17 00:00:00 2001 From: Paul Cassidy Date: Fri, 13 Mar 2015 11:18:12 -0700 Subject: [PATCH] Added support for --add-hosts command. Supports multiple entries. --- .../docker/client/model/ContainerConfig.java | 12 +++++++++++ .../docker/client/model/HostConfig.java | 21 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/main/java/com/nirima/docker/client/model/ContainerConfig.java b/src/main/java/com/nirima/docker/client/model/ContainerConfig.java index 3752e8a7..641b61dd 100644 --- a/src/main/java/com/nirima/docker/client/model/ContainerConfig.java +++ b/src/main/java/com/nirima/docker/client/model/ContainerConfig.java @@ -29,6 +29,7 @@ public class ContainerConfig implements Serializable { @JsonProperty("AttachStderr") private boolean attachStderr = false; @JsonProperty("Env") private String[] env; @JsonProperty("Cmd") private String[] cmd; + @JsonProperty("ExtraHosts") private String[] extraHosts; // Seems deprecated in later oocker APIs @JsonProperty("Dns") private String[] dns; @@ -227,6 +228,16 @@ public ContainerConfig setCmd(String[] cmd) { return this; } + public String[] getExtraHosts() { + return extraHosts; + } + + public ContainerConfig setExtraHosts(String[] extraHosts) { + this.extraHosts = extraHosts; + + return this; + } + public String[] getDns() { return dns; } @@ -310,6 +321,7 @@ public String toString() { .add("attachStderr", attachStderr) .add("env", env) .add("cmd", cmd) + .add("extraHosts", extraHosts) .add("dns", dns) .add("image", image) .add("volumes", volumes) diff --git a/src/main/java/com/nirima/docker/client/model/HostConfig.java b/src/main/java/com/nirima/docker/client/model/HostConfig.java index 295818a6..db731eea 100644 --- a/src/main/java/com/nirima/docker/client/model/HostConfig.java +++ b/src/main/java/com/nirima/docker/client/model/HostConfig.java @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; /** * @@ -21,6 +22,7 @@ */ @JsonIgnoreProperties(ignoreUnknown=true) public class HostConfig implements Serializable { + private static final Logger LOGGER = Logger.getLogger("freddy"); @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) @JsonProperty("Binds") @@ -57,6 +59,10 @@ public class HostConfig implements Serializable { @JsonProperty("VolumesFrom") private String[] volumesFrom; + @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) + @JsonProperty("ExtraHosts") + private String[] extraHosts; + public HostConfig() { } @@ -156,6 +162,20 @@ public void setVolumesFrom(String[] volumesFrom) { this.volumesFrom = volumesFrom; } + public String[] getExtraHosts() { + return extraHosts; + } + + public void setExtraHosts(String[] extraHosts) { + try{ + LOGGER.info("gonna try to set."); + this.extraHosts = extraHosts; + }catch(Exception e){ + LOGGER.info("failed to set wtf"); + LOGGER.info(e.getMessage()); + } + } + public class LxcConf implements Serializable { @JsonProperty("Key") public String key; @@ -190,6 +210,7 @@ public String toString() { .add("portBindings", portBindings) .add("privileged", privileged) .add("publishAllPorts", publishAllPorts) + .add("extraHosts", extraHosts) .add("dns", dns) .add("volumesFrom", volumesFrom) .toString();