From fa04aed6d47fb7956db42da33a44ab0e5d3cb9e7 Mon Sep 17 00:00:00 2001 From: Niklas Bolander Date: Fri, 17 Nov 2017 09:39:10 +0100 Subject: [PATCH 1/5] Apply build fix Suggested here https://github.com/docker-java/docker-java/issues/948 --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 640885610..ddf8b446a 100644 --- a/pom.xml +++ b/pom.xml @@ -462,6 +462,18 @@ org.eclipse.virgo.bundlor org.eclipse.virgo.bundlor.maven ${maven-bundlor-plugin.version} + + + org.eclipse.virgo.bundlor + org.eclipse.virgo.bundlor + 1.1.2.RELEASE + + + org.eclipse.virgo.bundlor + org.eclipse.virgo.bundlor.blint + 1.1.2.RELEASE + + bundlor From bb63738fae6796269fd22b2449e7145e8ff2c37d Mon Sep 17 00:00:00 2001 From: Niklas Bolander Date: Fri, 17 Nov 2017 13:01:20 +0100 Subject: [PATCH 2/5] Implement --group-add --- .../api/command/CreateContainerCmd.java | 4 ++++ .../dockerjava/api/model/HostConfig.java | 19 +++++++++++++++++++ .../core/command/CreateContainerCmdImpl.java | 13 +++++++++++++ .../dockerjava/cmd/CreateContainerCmdIT.java | 19 +++++++++++++++++++ 4 files changed, 55 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 77bf100ac..91621ce87 100644 --- 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 Date: Fri, 17 Nov 2017 13:03:53 +0100 Subject: [PATCH 3/5] Revert "Apply build fix" This reverts commit fa04aed --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index ddf8b446a..640885610 100644 --- a/pom.xml +++ b/pom.xml @@ -462,18 +462,6 @@ org.eclipse.virgo.bundlor org.eclipse.virgo.bundlor.maven ${maven-bundlor-plugin.version} - - - org.eclipse.virgo.bundlor - org.eclipse.virgo.bundlor - 1.1.2.RELEASE - - - org.eclipse.virgo.bundlor - org.eclipse.virgo.bundlor.blint - 1.1.2.RELEASE - - bundlor From ae0cec8e1a1abb0eeb82fecada1ec6f448e00c06 Mon Sep 17 00:00:00 2001 From: Niklas Bolander Date: Tue, 21 Nov 2017 09:54:16 +0100 Subject: [PATCH 4/5] Apply PR feedback from KostyaSha Removing null check and switched array to a String List. --- .../github/dockerjava/api/command/CreateContainerCmd.java | 4 ++-- .../java/com/github/dockerjava/api/model/HostConfig.java | 6 +++--- .../dockerjava/core/command/CreateContainerCmdImpl.java | 5 ++--- .../com/github/dockerjava/cmd/CreateContainerCmdIT.java | 5 +++-- 4 files changed, 10 insertions(+), 10 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 91621ce87..bb5971a4c 100644 --- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java @@ -435,9 +435,9 @@ public interface CreateContainerCmd extends SyncDockerCmd groups); - String[] getGroupAdd(); + List 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 index e22cdabb9..9b1e31daf 100644 --- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -201,7 +201,7 @@ public class HostConfig implements Serializable { private Long pidsLimit; @JsonProperty("GroupAdd") - private String[] groupAdd; + private List groupAdd; @JsonIgnore public Bind[] getBinds() { @@ -824,14 +824,14 @@ public HostConfig withPidsLimit(Long pidsLimit) { * @see #groupAdd */ @CheckForNull - public String[] getGroupAdd() { + public List getGroupAdd() { return groupAdd; } /** * @see #groupAdd */ - public HostConfig withGroupAdd(String[] groupAdd) { + public HostConfig withGroupAdd(List groupAdd) { this.groupAdd = groupAdd; 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 4c2994202..c1a54ba66 100644 --- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -256,7 +256,7 @@ public String[] getDnsSearch() { @Override @JsonIgnore - public String[] getGroupAdd() { + public List getGroupAdd() { return hostConfig.getGroupAdd(); } @@ -994,8 +994,7 @@ public CreateContainerCmd withHostConfig(HostConfig hostConfig) { } @Override - public CreateContainerCmd withGroupAdd(String[] groupAdd) { - checkNotNull(groupAdd, "groupAdd was not specified"); + public CreateContainerCmd withGroupAdd(List groupAdd) { this.hostConfig.withGroupAdd(groupAdd); return this; } diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java index f2b348e80..6e8386069 100644 --- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java +++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java @@ -34,6 +34,7 @@ import java.security.SecureRandom; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -826,7 +827,7 @@ public void createContainerWithNetworkID() { @Test public void createContainerWithGroupAdd() throws DockerException { - String[] groupsToAdd = {"www-data"}; + List groupsToAdd = Arrays.asList("www-data"); CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE) .withGroupAdd(groupsToAdd) @@ -838,7 +839,7 @@ public void createContainerWithGroupAdd() throws DockerException { InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec(); - LOG.info("Inspect container {}", Arrays.toString(inspectContainerResponse.getHostConfig().getGroupAdd())); + LOG.info("Inspect container {}", inspectContainerResponse.getHostConfig().getGroupAdd()); assertThat(inspectContainerResponse.getHostConfig().getGroupAdd(), is(groupsToAdd)); } From db1df35270b5f89fb52b421560274479d713ae42 Mon Sep 17 00:00:00 2001 From: Niklas Bolander Date: Wed, 7 Feb 2018 22:38:48 +0100 Subject: [PATCH 5/5] Whitespace fix --- src/main/java/com/github/dockerjava/api/model/HostConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4126bbd7a..fefeacb36 100644 --- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -202,7 +202,7 @@ public class HostConfig implements Serializable { @JsonProperty("GroupAdd") private List groupAdd; - + /** * @since ~{@link RemoteApiVersion#VERSION_1_30} */