Implement --group-add

Niklas Bolander · Niklas Bolander · commit bb63738fae67 · 2017-11-17T13:01:20.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -435,6 +435,10 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withCgroupParent(String cgroupParent);
 
+    CreateContainerCmd withGroupAdd(String[] groups);
+
+    String[] getGroupAdd();
+
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -200,6 +200,8 @@ public class HostConfig implements Serializable {
     @JsonProperty("PidsLimit")
     private Long pidsLimit;
 
+    @JsonProperty("GroupAdd")
+    private String[] groupAdd;
 
     @JsonIgnore
     public Bind[] getBinds() {
@@ -816,6 +818,23 @@ public HostConfig withPidsLimit(Long pidsLimit) {
         this.pidsLimit = pidsLimit;
         return this;
     }
+
+
+    /**
+     * @see #groupAdd
+     */
+    @CheckForNull
+    public String[] getGroupAdd() {
+        return groupAdd;
+    }
+
+    /**
+     * @see #groupAdd
+     */
+    public HostConfig withGroupAdd(String[] groupAdd) {
+        this.groupAdd = groupAdd;
+        return this;
+    }
     // end of auto-generated
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -254,6 +254,12 @@ public String[] getDnsSearch() {
         return hostConfig.getDnsSearch();
     }
 
+    @Override
+    @JsonIgnore
+    public String[] getGroupAdd() {
+        return hostConfig.getGroupAdd();
+    }
+
     @Override
     public String getDomainName() {
         return domainName;
@@ -987,6 +993,13 @@ public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withGroupAdd(String[] groupAdd) {
+        checkNotNull(groupAdd, "groupAdd was not specified");
+        this.hostConfig.withGroupAdd(groupAdd);
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -823,4 +823,23 @@ public void createContainerWithNetworkID() {
         }
         assertThat(containerNetwork, notNullValue());
     }
+
+    @Test
+    public void createContainerWithGroupAdd() throws DockerException {
+        String[] groupsToAdd = {"www-data"};
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withGroupAdd(groupsToAdd)
+                .withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        LOG.info("Inspect container {}", Arrays.toString(inspectContainerResponse.getHostConfig().getGroupAdd()));
+
+        assertThat(inspectContainerResponse.getHostConfig().getGroupAdd(), is(groupsToAdd));
+    }
 }
