diff --git a/pom.xml b/pom.xml index 216c48631..10e8dedec 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.docker-java docker-java jar - 3.0.7-SNAPSHOT + 3.0.6-IZ docker-java https://github.com/docker-java/docker-java @@ -63,6 +63,7 @@ 1.12 1.10 2.5 + 2.6 1.7.21 diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java index 062082a03..0ea29bcaf 100644 --- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -14,6 +14,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; +import java.util.Map; /** * Used in `/containers/create`, and in inspect container. @@ -170,6 +171,9 @@ public class HostConfig implements Serializable { @JsonProperty("PidMode") private String pidMode; + @JsonProperty("Tmpfs") + private Map tmpfs; + /** * @since {@link RemoteApiVersion#VERSION_1_20} */ @@ -194,7 +198,6 @@ public class HostConfig implements Serializable { @JsonProperty("ShmSize") private Long shmSize; - @JsonIgnore public Bind[] getBinds() { return (binds == null) ? new Bind[0] : binds.getBinds(); @@ -415,6 +418,11 @@ public String getVolumeDriver() { return volumeDriver; } + @CheckForNull + public Map getTmpfs() { + return tmpfs; + } + /** * Parse the network mode as specified at * {@see https://github.com/docker/engine-api/blob/master/types/container/hostconfig_unix.go} @@ -796,6 +804,10 @@ public HostConfig withVolumesFrom(VolumesFrom[] volumesFrom) { } // end of auto-generated + public void setTmpfs(Map tmpfs) { + this.tmpfs = tmpfs; + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this); diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java index 2238dfcea..5b6d457d3 100644 --- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java +++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java @@ -16,6 +16,8 @@ import com.github.dockerjava.api.async.ResultCallback; import com.google.common.base.Throwables; +import com.github.dockerjava.api.exception.NotModifiedException; + /** * Abstract template implementation of {@link ResultCallback} * @@ -54,7 +56,9 @@ public void onError(Throwable throwable) { } try { - LOGGER.error("Error during callback", throwable); + if (!(throwable instanceof NotModifiedException)) { + LOGGER.error("Error during callback", throwable); + } } finally { try { close(); diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java index 26b950e4e..2291cc777 100644 --- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java +++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java @@ -314,7 +314,7 @@ private int read(InputStream is, byte[] buf) { @Override public void run() { - byte[] buffer = new byte[1024]; + byte[] buffer = new byte[1]; int read; while ((read = read(stdin, buffer)) != -1) {