X Tutup
Skip to content

Commit 5aca2b9

Browse files
committed
Merge pull request #106 from albers/capabilities
Allow to manage Linux capabilities in CreateContainerCmd
2 parents d2d9744 + 6225a25 commit 5aca2b9

File tree

9 files changed

+452
-27
lines changed

9 files changed

+452
-27
lines changed

src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.github.dockerjava.api.ConflictException;
44
import com.github.dockerjava.api.NotFoundException;
5+
import com.github.dockerjava.api.model.Capability;
56
import com.github.dockerjava.api.model.ExposedPort;
67
import com.github.dockerjava.api.model.HostConfig;
7-
import com.github.dockerjava.api.model.Links;
88
import com.github.dockerjava.api.model.Volume;
99

1010
public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
@@ -101,6 +101,25 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
101101

102102
public CreateContainerCmd withHostConfig(HostConfig hostConfig);
103103

104+
public Capability[] getCapAdd();
105+
106+
/**
107+
* Add linux <a
108+
* href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
109+
* capability</a> to the container. For example: adding {@link Capability#MKNOD}
110+
* allows the container to create special files using the 'mknod' command.
111+
*/
112+
public CreateContainerCmd withCapAdd(Capability... capAdd);
113+
114+
public Capability[] getCapDrop();
115+
116+
/**
117+
* Drop linux <a
118+
* href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
119+
* capability</a> from the container. For example: dropping {@link Capability#CHOWN}
120+
* prevents the container from changing the owner of any files.
121+
*/
122+
public CreateContainerCmd withCapDrop(Capability... capDrop);
104123

105124
/**
106125
* @throws NotFoundException No such container

src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.github.dockerjava.api.NotFoundException;
44
import com.github.dockerjava.api.NotModifiedException;
55
import com.github.dockerjava.api.model.Bind;
6+
import com.github.dockerjava.api.model.Capability;
67
import com.github.dockerjava.api.model.Device;
78
import com.github.dockerjava.api.model.Link;
89
import com.github.dockerjava.api.model.LxcConf;
@@ -41,9 +42,9 @@ public interface StartContainerCmd extends DockerCmd<Void> {
4142

4243
public RestartPolicy getRestartPolicy();
4344

44-
public String[] getCapAdd();
45+
public Capability[] getCapAdd();
4546

46-
public String[] getCapDrop();
47+
public Capability[] getCapDrop();
4748

4849
public StartContainerCmd withBinds(Bind... binds);
4950

@@ -115,18 +116,18 @@ public interface StartContainerCmd extends DockerCmd<Void> {
115116
/**
116117
* Add linux <a
117118
* href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
118-
* capability</a> to the container. For example: adding capability "MKNOD"
119+
* capability</a> to the container. For example: adding {@link Capability#MKNOD}
119120
* allows the container to create special files using the 'mknod' command.
120121
*/
121-
public StartContainerCmd withCapAdd(String... capAdd);
122+
public StartContainerCmd withCapAdd(Capability... capAdd);
122123

123124
/**
124125
* Drop linux <a
125126
* href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
126-
* capability</a> from the container. For example: dropping capability
127-
* "CHOWN" prevents the container from changing the owner of any files.
127+
* capability</a> from the container. For example: dropping {@link Capability#CHOWN}
128+
* prevents the container from changing the owner of any files.
128129
*/
129-
public StartContainerCmd withCapDrop(String... capDrop);
130+
public StartContainerCmd withCapDrop(Capability... capDrop);
130131

131132
/**
132133
* @throws NotFoundException

0 commit comments

Comments
 (0)
X Tutup