docker-java · carlossg · Jun 16, 2015 · Jun 21, 2015 · Jul 6, 2015 · Jul 7, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,16 @@
 Change Log
 ===
+
 Latest SNAPSHOT
 ---
-* [#248](https://github.com/docker-java/docker-java/pull/233) Removed deprecated start options
+
+* [#263](https://github.com/docker-java/docker-java/pull/263) Refactoring of streaming commands APIs (event, stats, log, attach)
+* [#262](https://github.com/docker-java/docker-java/pull/262) Accept filters in list containers 
+* [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container
+
+v.1.4.0
+---
+* [#248](https://github.com/docker-java/docker-java/pull/248) Removed deprecated start options
 * [#247](https://github.com/docker-java/docker-java/pull/247) Add Domainname attribute on create command
 * [#245](https://github.com/docker-java/docker-java/pull/245) Added ReadonlyRootfs option
 * [#233](https://github.com/docker-java/docker-java/pull/233) Labels are array of Strings (fixes #232) 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Remote API [v1.18](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.18.md), Docker Server version 1.6.x
+Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.19.md), Docker Server version 1.7.x
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.3.0</version>
+          <version>1.4.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.3.1-SNAPSHOT</version>
+          <version>1.4.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.command;
 
+import java.util.Map;
+
 import com.github.dockerjava.api.ConflictException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
@@ -41,6 +43,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public int getCpuShares();
 
+    /**
+     * @since 1.19
+     */
+    public Integer getCpuPeriod();
+
+    /**
+     * @since 1.19
+     */
+    public String getCpusetMems();
+
+    /**
+     * @since 1.19
+     */
+    public Integer getBlkioWeight();
+
+    /**
+     * @since 1.19
+     */
+    public Boolean isOomKillDisable();
+
     public Device[] getDevices();
 
     public String[] getDns();
@@ -137,6 +159,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withCpuShares(int cpuShares);
 
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpusetMems(String cpusetMems);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
     /**
      * Add host devices to the container
      */
@@ -173,6 +215,8 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withImage(String image);
 
+    public CreateContainerCmd withLabels(Map<String, String> labels);
+
     /**
      * Add link to another container.
      */
@@ -238,4 +282,9 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withMacAddress(String macAddress);
 
+    /**
+     * @return
+     */
+    Map<String, String> getLabels();
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * Get events
@@ -19,6 +20,10 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
 
     public String getUntil();
 
+    public Filters getFilters();
+
+    public EventsCmd withFilters(Filters filters);
+
     public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * List containers
@@ -31,6 +32,8 @@ public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
     public String getBeforeId();
 
+    public Filters getFilters();
+
     public ListContainersCmd withShowAll(boolean showAll);
 
     public ListContainersCmd withShowSize(boolean showSize);
@@ -41,6 +44,8 @@ public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
     public ListContainersCmd withBefore(String before);
 
+    public ListContainersCmd withFilters(Filters filters);
+
     public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
     }
 

diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import java.util.Map;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -31,6 +33,9 @@ public class Container {
     @JsonProperty("Ports")
     public Port[] ports;
 
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
     @JsonProperty("Status")
     private String status;
 
@@ -58,6 +63,10 @@ public Port[] getPorts() {
         return ports;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     public String[] getNames() {
         return names;
     }

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -51,6 +51,9 @@ public class ContainerConfig {
     @JsonProperty("Image")
     private String image;
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("MacAddress")
     private String macAddress;
 
@@ -184,6 +187,10 @@ public String[] getOnBuild() {
         return onBuild;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,10 +1,12 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * Representation of a Docker event.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Event {
     private String status;
 
@@ -14,6 +16,9 @@ public class Event {
 
     private long time;
 
+    @JsonIgnoreProperties
+    private Node node;
+
     /**
      * Default constructor for the deserialization.
      */
@@ -22,7 +27,7 @@ public Event() {
 
     /**
      * Constructor.
-     * 
+     *
      * @param id
      *            Container ID
      * @param status
@@ -46,7 +51,7 @@ public Event(String status, String id, String from, long time) {
      * Status of docker image or container. List of statuses is available in <a
      * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API
      * v.1.16</a>
-     * 
+     *
      * @return Status string
      */
     public String getStatus() {
@@ -55,7 +60,7 @@ public String getStatus() {
 
     /**
      * Get ID of docker container.
-     * 
+     *
      * @return Container ID
      */
     public String getId() {
@@ -64,7 +69,7 @@ public String getId() {
 
     /**
      * Get source image of the container.
-     * 
+     *
      * @return Name of the parent container
      */
     public String getFrom() {
@@ -73,13 +78,20 @@ public String getFrom() {
 
     /**
      * Get the event time. The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
-     * 
+     *
      * @return Event time in the specified format.
      */
     public long getTime() {
         return time;
     }
 
+    /**
+     * Returns the node when working against docker swarm
+     */
+    public Node getNode() {
+        return node;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

diff --git a/src/main/java/com/github/dockerjava/api/model/EventFilters.java b/src/main/java/com/github/dockerjava/api/model/EventFilters.java
@@ -0,0 +1,37 @@
+package com.github.dockerjava.api.model;
+
+import java.util.List;
+
+/**
+ * Representation of a Docker event filter.
+ *
+ * @author Carlos Sanchez <[email protected]>
+ * 
+ */
+public class EventFilters extends Filters {
+
+    /**
+     * Default constructor for the deserialization.
+     */
+    public EventFilters() {
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param event
+     *            event to filter
+     */
+    public EventFilters(String... event) {
+        super();
+        withEvent(event);
+    }
+
+    public Filters withEvent(String... event) {
+        return withFilter("event", event);
+    }
+
+    public List<String> getEvent() {
+        return getFilter("event");
+    }
+}