From caf8d2606bd68ae16bcebf4e5e160fc79c33653c Mon Sep 17 00:00:00 2001 From: Ben Willers Date: Tue, 6 Jan 2015 15:39:32 +0100 Subject: [PATCH 1/3] add hostconfig fields to containerconfig --- .../docker/client/model/ContainerConfig.java | 16 ++++++++++++++++ 1 file changed, 16 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..4bed8a57 100644 --- a/src/main/java/com/nirima/docker/client/model/ContainerConfig.java +++ b/src/main/java/com/nirima/docker/client/model/ContainerConfig.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import com.google.common.base.Objects; import java.io.Serializable; @@ -30,6 +32,11 @@ public class ContainerConfig implements Serializable { @JsonProperty("Env") private String[] env; @JsonProperty("Cmd") private String[] cmd; + @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) + @JsonProperty("HostConfig") + private HostConfig hostConfig; + //@JsonProperty("HostConfig") private HostConfig hostConfig; + // Seems deprecated in later oocker APIs @JsonProperty("Dns") private String[] dns; @JsonProperty("Image") private String image; @@ -45,6 +52,14 @@ public class ContainerConfig implements Serializable { @JsonProperty("OnBuild") private int[] onBuild; + public HostConfig getHostConfig() { + return hostConfig; + } + public ContainerConfig setHostConfig(HostConfig hostConfig) { + this.hostConfig = hostConfig; + return this; + } + public Map getExposedPorts() { return exposedPorts; } @@ -321,6 +336,7 @@ public String toString() { .add("domainName", domainName) .add("exposedPorts", exposedPorts) .add("onBuild", onBuild) + .add("hostConfig", hostConfig) .toString(); } } From b06c888a3d5605e88c1020ee4d193d4199910baa Mon Sep 17 00:00:00 2001 From: Ben Willers Date: Tue, 6 Jan 2015 15:40:12 +0100 Subject: [PATCH 2/3] fix runtime problem with jenkins --- src/main/java/com/nirima/docker/client/model/HostConfig.java | 2 ++ 1 file changed, 2 insertions(+) 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..ddb2ea2e 100644 --- a/src/main/java/com/nirima/docker/client/model/HostConfig.java +++ b/src/main/java/com/nirima/docker/client/model/HostConfig.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Objects; import com.google.common.collect.ArrayListMultimap; @@ -76,6 +77,7 @@ public void setPortBindings(Map portBindings) { /** * Set up some port mappings * **/ + @JsonIgnore public void setPortBindings(Iterable portMappingCollection) { Multimap bindings = ArrayListMultimap.create(); From f963e0de473ed8d262b623076193a17ec7e594d0 Mon Sep 17 00:00:00 2001 From: Ben Willers Date: Tue, 6 Jan 2015 15:46:51 +0100 Subject: [PATCH 3/3] fixed up leftovers --- .../java/com/nirima/docker/client/model/ContainerConfig.java | 5 ----- 1 file changed, 5 deletions(-) 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 4bed8a57..c769d1e5 100644 --- a/src/main/java/com/nirima/docker/client/model/ContainerConfig.java +++ b/src/main/java/com/nirima/docker/client/model/ContainerConfig.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Objects; @@ -31,12 +30,8 @@ public class ContainerConfig implements Serializable { @JsonProperty("AttachStderr") private boolean attachStderr = false; @JsonProperty("Env") private String[] env; @JsonProperty("Cmd") private String[] cmd; - - @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) @JsonProperty("HostConfig") private HostConfig hostConfig; - //@JsonProperty("HostConfig") private HostConfig hostConfig; - // Seems deprecated in later oocker APIs @JsonProperty("Dns") private String[] dns; @JsonProperty("Image") private String image;