Skip to content

Extend ContainerConfig with HostConfig #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evilbwil wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Extend ContainerConfig with HostConfig #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf8d26
add hostconfig fields to containerconfig
bwillersdigisofttv Jan 6, 2015
b06c888
fix runtime problem with jenkins
bwillersdigisofttv Jan 6, 2015
f963e0d
fixed up leftovers
bwillersdigisofttv Jan 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/main/java/com/nirima/docker/client/model/ContainerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import com.google.common.base.Objects;

import java.io.Serializable;
Expand Down Expand Up @@ -29,7 +30,8 @@ public class ContainerConfig implements Serializable {
@JsonProperty("AttachStderr") private boolean attachStderr = false;
@JsonProperty("Env") private String[] env;
@JsonProperty("Cmd") private String[] cmd;

@JsonProperty("HostConfig")
private HostConfig hostConfig;
// Seems deprecated in later oocker APIs
@JsonProperty("Dns") private String[] dns;
@JsonProperty("Image") private String image;
Expand All @@ -45,6 +47,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<String, ?> getExposedPorts() {
return exposedPorts;
}
Expand Down Expand Up @@ -321,6 +331,7 @@ public String toString() {
.add("domainName", domainName)
.add("exposedPorts", exposedPorts)
.add("onBuild", onBuild)
.add("hostConfig", hostConfig)
.toString();
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/nirima/docker/client/model/HostConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -76,6 +77,7 @@ public void setPortBindings(Map<String, PortBinding[]> portBindings) {
/**
* Set up some port mappings
* **/
@JsonIgnore
public void setPortBindings(Iterable<PortMapping> portMappingCollection) {

Multimap<String, PortBinding> bindings = ArrayListMultimap.create();
Expand Down