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

Author: alexec

.gitignore

@@ -19,3 +19,6 @@ target
 
 # Ignore all log files
 *.log
+
+#Ignore Test Output
+test-output

README.md

@@ -2,7 +2,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Client API v1.8, Docker Server version 0.8.1
+Supports a subset of the Docker Client API v1.10, Docker Server version 0.10
 
 ## Build with Maven
 

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

@@ -48,7 +48,7 @@ public class DockerClient
     private String restEndpointUrl;
 
     public DockerClient(String serverUrl) {
-        restEndpointUrl = serverUrl + "/v1.8";
+        restEndpointUrl = serverUrl + "/v1.10";
         ClientConfig clientConfig = new DefaultClientConfig();
         clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
 
@@ -709,7 +709,7 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
             FileUtils.copyFileToDirectory(dockerFile, tmpDockerContextFolder);
 
             for (String cmd : dockerFileContent) {
-                if (StringUtils.startsWithIgnoreCase(cmd.trim(), "ADD ")) {
+            	if (StringUtils.startsWithIgnoreCase(cmd.trim(), "ADD")) {
                     String addArgs[] = StringUtils.split(cmd, " \t");
                     if (addArgs.length != 3) {
                         throw new DockerException(String.format("Wrong format on line [%s]", cmd));

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

@@ -37,7 +37,8 @@ public class ContainerConfig {
     @JsonProperty("Domainname")   private String domainName = "";
     // FIXME Is this the right type? -BJE
     @JsonProperty("ExposedPorts")   private Map<String, ?> exposedPorts;
-    @JsonProperty("OnBuild")          private String[]  onBuild;
+    
+    @JsonProperty("OnBuild")   private int[] onBuild;
 
     public Map<String, ?> getExposedPorts() {
         return exposedPorts;
@@ -242,14 +243,19 @@ public ContainerConfig setEntrypoint(String[] entrypoint) {
         this.entrypoint = entrypoint;
         return this;
     }
-
-    public String[] getOnBuild() {
-	return onBuild;
-    }
-
-    public void setOnBuild(String[] onBuild) {
-	this.onBuild=onBuild;
-    }
+    
+    public void setOnBuild(int[] onBuild) {
+		this.onBuild = onBuild;
+	}
+    
+    public int[] getOnBuild() {
+		return onBuild;
+	}
+    
+    public void setDomainName(String domainName) {
+		this.domainName = domainName;
+	}
+   
 
     @Override
     public String toString() {
@@ -277,6 +283,7 @@ public String toString() {
                 ", privileged=" + privileged +
                 ", workingDir='" + workingDir + '\'' +
                 ", domainName='" + domainName + '\'' +
+                ", onBuild='" + onBuild + '\'' +
                 '}';
     }
 }

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

@@ -3,6 +3,7 @@
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -63,12 +64,9 @@ public class ContainerInspectResponse {
     @JsonProperty("HostConfig")
     private HostConfig hostConfig;
 
-    /**
-     * http://blog.docker.io/2014/03/docker-0-9-introducing-execution-drivers-and-libcontainer/
-     */
     @JsonProperty("ExecDriver")
     private String execDriver;
-
+    
     public String getId() {
         return id;
     }
@@ -204,6 +202,14 @@ public HostConfig getHostConfig() {
     public void setHostConfig(HostConfig hostConfig) {
         this.hostConfig = hostConfig;
     }
+    
+    public void setExecDriver(String execDriver) {
+		this.execDriver = execDriver;
+	}
+    
+    public String getExecDriver() {
+		return execDriver;
+	}
 
     public class NetworkSettings {
 

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

@@ -1,6 +1,5 @@
 package com.kpelykh.docker.client.model;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Arrays;
@@ -36,7 +35,13 @@ public class HostConfig {
 
     @JsonProperty("Dns")
     private String dns;
-
+  
+    @JsonProperty("DnsSearch")
+    private String dnsSearch;
+    
+    @JsonProperty("VolumesFrom")
+    private String volumesFrom;
+    
     public HostConfig() {
         this.binds = null;
     }
@@ -50,12 +55,6 @@ public void setBinds(String[] binds) {
         this.binds = binds;
     }
 
-    // TODO - causes jackson conflict with tests
-    @JsonIgnore
-    public void setBinds(final BoundHostVolumes volumes) {
-        setBinds(volumes.asBinds());
-    }
-
     public String getContainerIDFile() {
         return containerIDFile;
     }
@@ -103,15 +102,31 @@ public boolean isPublishAllPorts() {
     public void setPublishAllPorts(boolean publishAllPorts) {
         this.publishAllPorts = publishAllPorts;
     }
-
+    
     public String getDns() {
-        return dns;
-    }
-
+		return dns;
+	}
+    
     public void setDns(String dns) {
-        this.dns = dns;
-    }
-
+		this.dns = dns;
+	}
+    
+    public void setDnsSearch(String dnsSearch) {
+		this.dnsSearch = dnsSearch;
+	}
+    
+    public String getDnsSearch() {
+		return dnsSearch;
+	}
+    
+    public void setVolumesFrom(String volumesFrom) {
+		this.volumesFrom = volumesFrom;
+	}
+    
+    public String getVolumesFrom() {
+		return volumesFrom;
+	}
+    
     @Override
     public String toString() {
         return "HostConfig{" +

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

@@ -200,7 +200,7 @@ public String getExecutionDriver() {
     public void setExecutionDriver(String executionDriver) {
         this.executionDriver=executionDriver;
     }
-
+    
     @Override
     public String toString() {
         return "Info{" +

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

@@ -78,14 +78,14 @@ public String getOperatingSystem() {
     public void setOperatingSystem(String operatingSystem) {
         this.operatingSystem = operatingSystem;
     }
-
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
+    
     public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
+		this.apiVersion = apiVersion;
+	}
+        
+    public String getApiVersion() {
+		return apiVersion;
+	}
 
     @Override
     public String toString() {