Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4ac45cd

Browse files
alexecalexec
committed
Merge remote-tracking branch 'luismclglass/master'
Conflicts: README.md src/main/java/com/kpelykh/docker/client/DockerClient.java src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java src/main/java/com/kpelykh/docker/client/model/HostConfig.java src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java src/test/resources/testAddFile/Dockerfile
2 parents 0bcade7 + bced4af commit 4ac45cd

File tree

14 files changed

+799
-712
lines changed

14 files changed

+799
-712
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ target
1919

2020
# Ignore all log files
2121
*.log
22+
23+
#Ignore Test Output
24+
test-output

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Java API client for [Docker](http://docs.docker.io/ "Docker")
44

5-
Supports a subset of the Docker Client API v1.8, Docker Server version 0.8.1
5+
Supports a subset of the Docker Client API v1.10, Docker Server version 0.10
66

77
## Build with Maven
88

‎src/main/java/com/kpelykh/docker/client/DockerClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class DockerClient
4848
private String restEndpointUrl;
4949

5050
public DockerClient(String serverUrl) {
51-
restEndpointUrl = serverUrl + "/v1.8";
51+
restEndpointUrl = serverUrl + "/v1.10";
5252
ClientConfig clientConfig = new DefaultClientConfig();
5353
clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
5454

@@ -709,7 +709,7 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
709709
FileUtils.copyFileToDirectory(dockerFile, tmpDockerContextFolder);
710710

711711
for (String cmd : dockerFileContent) {
712-
if (StringUtils.startsWithIgnoreCase(cmd.trim(), "ADD ")) {
712+
if (StringUtils.startsWithIgnoreCase(cmd.trim(), "ADD")) {
713713
String addArgs[] = StringUtils.split(cmd, " \t");
714714
if (addArgs.length != 3) {
715715
throw new DockerException(String.format("Wrong format on line [%s]", cmd));

‎src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public class ContainerConfig {
3737
@JsonProperty("Domainname") private String domainName = "";
3838
// FIXME Is this the right type? -BJE
3939
@JsonProperty("ExposedPorts") private Map<String, ?> exposedPorts;
40-
@JsonProperty("OnBuild") private String[] onBuild;
40+
41+
@JsonProperty("OnBuild") private int[] onBuild;
4142

4243
public Map<String, ?> getExposedPorts() {
4344
return exposedPorts;
@@ -242,14 +243,19 @@ public ContainerConfig setEntrypoint(String[] entrypoint) {
242243
this.entrypoint = entrypoint;
243244
return this;
244245
}
245-
246-
public String[] getOnBuild() {
247-
return onBuild;
248-
}
249-
250-
public void setOnBuild(String[] onBuild) {
251-
this.onBuild=onBuild;
252-
}
246+
247+
public void setOnBuild(int[] onBuild) {
248+
this.onBuild = onBuild;
249+
}
250+
251+
public int[] getOnBuild() {
252+
return onBuild;
253+
}
254+
255+
public void setDomainName(String domainName) {
256+
this.domainName = domainName;
257+
}
258+
253259

254260
@Override
255261
public String toString() {
@@ -277,6 +283,7 @@ public String toString() {
277283
", privileged=" + privileged +
278284
", workingDir='" + workingDir + '\'' +
279285
", domainName='" + domainName + '\'' +
286+
", onBuild='" + onBuild + '\'' +
280287
'}';
281288
}
282289
}

‎src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.codehaus.jackson.annotate.JsonProperty;
55

6+
import java.util.Arrays;
67
import java.util.Map;
78

89
/**
@@ -63,12 +64,9 @@ public class ContainerInspectResponse {
6364
@JsonProperty("HostConfig")
6465
private HostConfig hostConfig;
6566

66-
/**
67-
* http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-and-libcontainer/
68-
*/
6967
@JsonProperty("ExecDriver")
7068
private String execDriver;
71-
69+
7270
public String getId() {
7371
return id;
7472
}
@@ -204,6 +202,14 @@ public HostConfig getHostConfig() {
204202
public void setHostConfig(HostConfig hostConfig) {
205203
this.hostConfig = hostConfig;
206204
}
205+
206+
public void setExecDriver(String execDriver) {
207+
this.execDriver = execDriver;
208+
}
209+
210+
public String getExecDriver() {
211+
return execDriver;
212+
}
207213

208214
public class NetworkSettings {
209215

‎src/main/java/com/kpelykh/docker/client/model/HostConfig.java‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnore;
43
import org.codehaus.jackson.annotate.JsonProperty;
54

65
import java.util.Arrays;
@@ -36,7 +35,13 @@ public class HostConfig {
3635

3736
@JsonProperty("Dns")
3837
private String dns;
39-
38+
39+
@JsonProperty("DnsSearch")
40+
private String dnsSearch;
41+
42+
@JsonProperty("VolumesFrom")
43+
private String volumesFrom;
44+
4045
public HostConfig() {
4146
this.binds = null;
4247
}
@@ -50,12 +55,6 @@ public void setBinds(String[] binds) {
5055
this.binds = binds;
5156
}
5257

53-
// TODO - causes jackson conflict with tests
54-
@JsonIgnore
55-
public void setBinds(final BoundHostVolumes volumes) {
56-
setBinds(volumes.asBinds());
57-
}
58-
5958
public String getContainerIDFile() {
6059
return containerIDFile;
6160
}
@@ -103,15 +102,31 @@ public boolean isPublishAllPorts() {
103102
public void setPublishAllPorts(boolean publishAllPorts) {
104103
this.publishAllPorts = publishAllPorts;
105104
}
106-
105+
107106
public String getDns() {
108-
return dns;
109-
}
110-
107+
return dns;
108+
}
109+
111110
public void setDns(String dns) {
112-
this.dns = dns;
113-
}
114-
111+
this.dns = dns;
112+
}
113+
114+
public void setDnsSearch(String dnsSearch) {
115+
this.dnsSearch = dnsSearch;
116+
}
117+
118+
public String getDnsSearch() {
119+
return dnsSearch;
120+
}
121+
122+
public void setVolumesFrom(String volumesFrom) {
123+
this.volumesFrom = volumesFrom;
124+
}
125+
126+
public String getVolumesFrom() {
127+
return volumesFrom;
128+
}
129+
115130
@Override
116131
public String toString() {
117132
return "HostConfig{" +

‎src/main/java/com/kpelykh/docker/client/model/Info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public String getExecutionDriver() {
200200
public void setExecutionDriver(String executionDriver) {
201201
this.executionDriver=executionDriver;
202202
}
203-
203+
204204
@Override
205205
public String toString() {
206206
return "Info{" +

‎src/main/java/com/kpelykh/docker/client/model/Version.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ public String getOperatingSystem() {
7878
public void setOperatingSystem(String operatingSystem) {
7979
this.operatingSystem = operatingSystem;
8080
}
81-
82-
public String getApiVersion() {
83-
return apiVersion;
84-
}
85-
81+
8682
public void setApiVersion(String apiVersion) {
87-
this.apiVersion = apiVersion;
88-
}
83+
this.apiVersion = apiVersion;
84+
}
85+
86+
public String getApiVersion() {
87+
return apiVersion;
88+
}
8989

9090
@Override
9191
public String toString() {

0 commit comments

Comments
 (0)