diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-24 09:30:16 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-24 09:30:16 +0200 |
| commit | cca609a44cad78f43aaeadf4cd297044ed8b38eb (patch) | |
| tree | 2e3123304c429e570893958e356b5642ecc68df1 /docker-api | |
| parent | 076a11763e1002a8881025ae42e068d92c7ec9f2 (diff) | |
Add --pids-limit to toString
Diffstat (limited to 'docker-api')
2 files changed, 2 insertions, 0 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java index 343f21540a2..ed623c82259 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java @@ -243,6 +243,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { toOptionalOption("--memory", containerResources.map(ContainerResources::memoryBytes)), toRepeatedOption("--label", labelList), toRepeatedOption("--ulimit", ulimitList), + "--pids-limit -1", toRepeatedOption("--env", environmentAssignments), toRepeatedOption("--volume", volumeBindSpecs), toRepeatedOption("--cap-add", addCapabilitiesList), diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java index 7d41d873be2..3b8b0a84e64 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java @@ -49,6 +49,7 @@ public class CreateContainerCommandImplTest { "--label my-label=test-label " + "--ulimit nofile=1:2 " + "--ulimit nproc=10:20 " + + "--pids-limit -1 " + "--env env1=val1 " + "--env env2=val2 " + "--volume vol1:/host/vol1:Z " + |