diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java index 902d01016..c03a6334a 100644 --- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java @@ -1,5 +1,7 @@ package com.github.dockerjava.api.command; +import java.util.List; + import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -20,6 +22,9 @@ public interface ExecCreateCmd extends SyncDockerCmd { @CheckForNull Boolean hasTtyEnabled(); + @CheckForNull + List getEnv(); + @CheckForNull String getUser(); @@ -37,6 +42,8 @@ public interface ExecCreateCmd extends SyncDockerCmd { ExecCreateCmd withCmd(String... cmd); + ExecCreateCmd withEnv(List env); + ExecCreateCmd withContainerId(@Nonnull String containerId); ExecCreateCmd withTty(Boolean tty); 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 b857725e3..9974622e9 100644 --- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -174,6 +174,12 @@ public class HostConfig implements Serializable { @JsonProperty("RestartPolicy") private RestartPolicy restartPolicy; + /** + * @since {@link RemoteApiVersion#VERSION_1_24} + */ + @JsonProperty("StorageOpt") + private Map storageOpt; + @JsonProperty("Ulimits") private Ulimit[] ulimits; @@ -845,6 +851,21 @@ public HostConfig withRestartPolicy(RestartPolicy restartPolicy) { return this; } + /** + * @see #storageOpt + */ + public Map getStorageOpt() { + return storageOpt; + } + + /** + * @see #storageOpt + */ + public HostConfig withStorageOpt(Map storageOpt) { + this.storageOpt = storageOpt; + return this; + } + /** * @see #securityOpts */ diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java index 051a45f0c..ecf208b7e 100644 --- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java @@ -2,6 +2,8 @@ import static com.google.common.base.Preconditions.checkNotNull; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,6 +43,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd env; + /** * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_35} */ @@ -95,6 +103,12 @@ public ExecCreateCmd withCmd(String... cmd) { return this; } + @Override + public ExecCreateCmd withEnv(List env) { + this.env = env; + return this; + } + @Override public ExecCreateCmd withPrivileged(Boolean privileged) { this.privileged = privileged; @@ -132,6 +146,11 @@ public Boolean hasTtyEnabled() { return tty; } + @Override + public List getEnv() { + return env; + } + @Override public Boolean getPrivileged() { return privileged;