diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2018-08-30 10:50:44 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2018-08-30 10:50:44 +0200 |
| commit | a4095d49eda6a7da77d695e4e01d6e9f0d0fc604 (patch) | |
| tree | e1b845c79eb4c10224b274a60974e3e4bd7fd4f9 /docker-api | |
| parent | 9a515bdc2caa36f75d4db5b4912c5a3d607df059 (diff) | |
Remove runContainersInPrivileged config option
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 3 | ||||
| -rw-r--r-- | docker-api/src/main/resources/configdefinitions/docker.def | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 958f1c70965..c5c4547f796 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -186,8 +186,7 @@ public class DockerImpl implements Docker { @Override public CreateContainerCommand createContainerCommand(DockerImage image, ContainerResources containerResources, ContainerName name, String hostName) { - return new CreateContainerCommandImpl(dockerClient, image, containerResources, name, hostName) - .withPrivileged(config.runContainersInPrivileged()); + return new CreateContainerCommandImpl(dockerClient, image, containerResources, name, hostName); } @Override diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def index 7be8d85e0a9..83fee05dff6 100644 --- a/docker-api/src/main/resources/configdefinitions/docker.def +++ b/docker-api/src/main/resources/configdefinitions/docker.def @@ -13,5 +13,3 @@ isRunningLocally bool default = false imageGCMinTimeToLiveMinutes int default = 45 networkNATed bool default = false - -runContainersInPrivileged bool default = false |