From de8eff20fd8e8a02ea32a6bc8d319e11f16d9365 Mon Sep 17 00:00:00 2001
From: "matthewb@labkey.com" <matthewb@labkey.com>
Date: Wed, 5 Oct 2016 15:28:02 -0700
Subject: [PATCH 1/2] withSecurityOpt

---
 .../api/command/CreateContainerCmd.java       |  7 +++++++
 .../core/command/CreateContainerCmdImpl.java  | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 196763560..3d1e3952a 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -193,6 +193,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Boolean isTty();
 
+    @CheckForNull
+    String[] getSecurityOpt();
+
     /**
      * Add network-scoped alias for the container
      * @param aliases on ore more aliases
@@ -436,6 +439,10 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     CreateContainerCmd withPidMode(String pidMode);
 
+    CreateContainerCmd withSecurityOpt(String... securityOpt);
+
+    CreateContainerCmd withSecurityOpt(List<String> securityOpt);
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 0b6944b04..7935f722b 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -118,6 +118,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("NetworkingConfig")
     private NetworkingConfig networkingConfig;
 
+    @JsonProperty("SecurityOpt")
+    private String[] securityOpt;
+
     @JsonIgnore
     private String ipv4Address = null;
 
@@ -477,6 +480,11 @@ public String getCgroupParent() {
         return hostConfig.getCgroupParent();
     }
 
+    @Override
+    public String[] getSecurityOpt() {
+        return securityOpt;
+    }
+
     @Override
     public CreateContainerCmd withAliases(String... aliases) {
         this.aliases = Arrays.asList(aliases);
@@ -976,6 +984,18 @@ public CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withSecurityOpt(String... securityOpt) {
+        this.securityOpt = securityOpt;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withSecurityOpt(List<String> securityOpt) {
+        checkNotNull(securityOpt, "security_opt was not specified");
+        return withSecurityOpt(securityOpt.toArray(new String[securityOpt.size()]));
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

From 0d79c58185213ba36b4b4ed8a9768e8d169fef25 Mon Sep 17 00:00:00 2001
From: "matthewb@labkey.com" <matthewb@labkey.com>
Date: Mon, 17 Oct 2016 15:37:13 -0700
Subject: [PATCH 2/2] use HostConfig.setSecurityOpts()

---
 .../api/command/CreateContainerCmd.java          |  6 +++---
 .../github/dockerjava/api/model/HostConfig.java  |  6 +++---
 .../core/command/CreateContainerCmdImpl.java     | 16 +++++++---------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 3d1e3952a..65bdafcac 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -194,7 +194,7 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     Boolean isTty();
 
     @CheckForNull
-    String[] getSecurityOpt();
+    String[] getSecurityOpts();
 
     /**
      * Add network-scoped alias for the container
@@ -439,9 +439,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     CreateContainerCmd withPidMode(String pidMode);
 
-    CreateContainerCmd withSecurityOpt(String... securityOpt);
+    CreateContainerCmd withSecurityOpts(String... securityOpt);
 
-    CreateContainerCmd withSecurityOpt(List<String> securityOpt);
+    CreateContainerCmd withSecurityOpts(List<String> securityOpt);
 
     /**
      * @throws NotFoundException
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 19a6a9128..4d9d7f145 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -172,7 +172,7 @@ public class HostConfig {
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
     @JsonProperty("SecurityOpt")
-    private List<String> securityOpts;
+    private String[] securityOpts;
 
     /**
      * @since {@link RemoteApiVersion#VERSION_1_20}
@@ -385,7 +385,7 @@ public Boolean getOomKillDisable() {
      * @see #securityOpts
      */
     @CheckForNull
-    public List<String> getSecurityOpts() {
+    public String[] getSecurityOpts() {
         return securityOpts;
     }
 
@@ -756,7 +756,7 @@ public HostConfig withRestartPolicy(RestartPolicy restartPolicy) {
     /**
      * @see #securityOpts
      */
-    public HostConfig withSecurityOpts(List<String> securityOpts) {
+    public HostConfig withSecurityOpts(String[] securityOpts) {
         this.securityOpts = securityOpts;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 7935f722b..561871a09 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -118,9 +118,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("NetworkingConfig")
     private NetworkingConfig networkingConfig;
 
-    @JsonProperty("SecurityOpt")
-    private String[] securityOpt;
-
     @JsonIgnore
     private String ipv4Address = null;
 
@@ -481,8 +478,9 @@ public String getCgroupParent() {
     }
 
     @Override
-    public String[] getSecurityOpt() {
-        return securityOpt;
+    @JsonIgnore
+    public String[] getSecurityOpts() {
+        return hostConfig.getSecurityOpts();
     }
 
     @Override
@@ -985,15 +983,15 @@ public CreateContainerCmd withPidMode(String pidMode) {
     }
 
     @Override
-    public CreateContainerCmd withSecurityOpt(String... securityOpt) {
-        this.securityOpt = securityOpt;
+    public CreateContainerCmd withSecurityOpts(String... securityOpt) {
+        this.hostConfig.withSecurityOpts(securityOpt);
         return this;
     }
 
     @Override
-    public CreateContainerCmd withSecurityOpt(List<String> securityOpt) {
+    public CreateContainerCmd withSecurityOpts(List<String> securityOpt) {
         checkNotNull(securityOpt, "security_opt was not specified");
-        return withSecurityOpt(securityOpt.toArray(new String[securityOpt.size()]));
+        return withSecurityOpts(securityOpt.toArray(new String[securityOpt.size()]));
     }
 
     @Override