diff options
| author | Tianon Gravi <admwiggin@gmail.com> | 2014-07-02 10:08:11 -0600 |
|---|---|---|
| committer | Tianon Gravi <admwiggin@gmail.com> | 2014-07-02 10:08:11 -0600 |
| commit | 292483531f269261d6d8b6a98c1a23879b00d851 (patch) | |
| tree | 9f631728bf22a4845754989828a690e774528d92 | |
| parent | 5ff18b8155b4cd6274b63ea227ff3d686464dc14 (diff) | |
| parent | bae79c3e7285c170f97a0f7f331a48fb47f0f40e (diff) | |
| download | docker-292483531f269261d6d8b6a98c1a23879b00d851.tar.gz | |
Merge pull request #6814 from tianon/more-init-ulimit
Add NOFILE and NPROC ulimit settings to OpenRC and SysVinit
| -rwxr-xr-x | contrib/init/openrc/docker.initd | 3 | ||||
| -rwxr-xr-x | contrib/init/sysvinit-debian/docker | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd index 2d79a73973..a9d21b1708 100755 --- a/contrib/init/openrc/docker.initd +++ b/contrib/init/openrc/docker.initd @@ -11,6 +11,9 @@ DOCKER_OPTS=${DOCKER_OPTS:-} start() { checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" + ulimit -n 1048576 + ulimit -u 1048576 + ebegin "Starting docker daemon" start-stop-daemon --start --background \ --exec "$DOCKER_BINARY" \ diff --git a/contrib/init/sysvinit-debian/docker b/contrib/init/sysvinit-debian/docker index a3b9353754..6250cae053 100755 --- a/contrib/init/sysvinit-debian/docker +++ b/contrib/init/sysvinit-debian/docker @@ -88,6 +88,9 @@ case "$1" in touch "$DOCKER_LOGFILE" chgrp docker "$DOCKER_LOGFILE" + ulimit -n 1048576 + ulimit -u 1048576 + log_begin_msg "Starting $DOCKER_DESC: $BASE" start-stop-daemon --start --background \ --no-close \ |