docker 0.9 compat

alex.collins · alex.collins · commit b69babb8a44e · 2014-04-12T16:57:58.000+01:00
diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java
@@ -3,7 +3,6 @@
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
-import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -64,6 +63,12 @@ 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;
     }
diff --git a/src/main/java/com/kpelykh/docker/client/model/HostConfig.java b/src/main/java/com/kpelykh/docker/client/model/HostConfig.java
@@ -1,5 +1,6 @@
 package com.kpelykh.docker.client.model;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.Arrays;
@@ -45,7 +46,9 @@ public String[] getBinds() {
     public void setBinds(String[] binds) {
         this.binds = binds;
     }
-    
+
+    // TODO - causes jackson conflict with tests
+    @JsonIgnore
     public void setBinds(final BoundHostVolumes volumes) {
         setBinds(volumes.asBinds());
     }
