From d9416246abe8c129e35d68d638e024c1169f713d Mon Sep 17 00:00:00 2001
From: troubadout <nicolas@breihzjug.org>
Date: Tue, 5 Dec 2017 15:47:58 +0100
Subject: [PATCH 1/2] introduce support for IPC mode

---
 .../github/dockerjava/api/model/HostConfig.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 d808ef245..89d6c7ffd 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -170,6 +170,9 @@ public class HostConfig implements Serializable {
     @JsonProperty("PidMode")
     private String pidMode;
 
+    @JsonProperty("IpcMode")
+    private String ipcMode;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
@@ -301,6 +304,11 @@ public String getPidMode() {
         return pidMode;
     }
 
+    @CheckForNull
+    public String getIpcMode() {
+        return ipcMode;
+    }
+
     /**
      * @see #blkioDeviceReadBps
      */
@@ -705,6 +713,14 @@ public HostConfig withPidMode(String pidMode) {
         return this;
     }
 
+    /**
+     * @see #ipcMode
+     */
+    public HostConfig withIpcMode(String ipcMode) {
+        this.ipcMode = ipcMode;
+        return this;
+    }
+
     /**
      * @see #portBindings
      */

From f45a55b4dbf0078124ad1eeaf97acec296e0681f Mon Sep 17 00:00:00 2001
From: troubadout <nicolas@breihzjug.org>
Date: Tue, 5 Dec 2017 15:52:52 +0100
Subject: [PATCH 2/2] introduce support for Env in docker exec create

---
 .../dockerjava/api/command/ExecCreateCmd.java   |  5 +++++
 .../core/command/ExecCreateCmdImpl.java         | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

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 1ab974644..132fa6c27 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -26,6 +26,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
     @CheckForNull
     Boolean getPrivileged();
 
+    @CheckForNull
+    String[] getEnv();
+
     ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
     ExecCreateCmd withAttachStdin(Boolean attachStdin);
@@ -42,6 +45,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     ExecCreateCmd withPrivileged(Boolean isPrivileged);
 
+    ExecCreateCmd withEnv(String... env);
+
     interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 
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 ed6e58211..7b341f5da 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -41,6 +41,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     @JsonProperty("Cmd")
     private String[] cmd;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("Env")
+    private String[] env;
+
     public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -95,6 +101,12 @@ public ExecCreateCmd withPrivileged(Boolean privileged) {
         return this;
     }
 
+    @Override
+    public ExecCreateCmd withEnv(String... env) {
+        this.env = env;
+        return this;
+    }
+
     @Override
     public String getContainerId() {
         return containerId;
@@ -130,6 +142,11 @@ public String getUser() {
         return user;
     }
 
+    @Override
+    public String[] getEnv() {
+        return env;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container