kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #24555 from thaJeztah/to-infinity-and-beyond

Browse source 
Don't set ulimits (nproc) for all init scripts
This commit is contained in:
Alexander Morozov 2016-07-28 16:48:16 -07:00 • committed by GitHub
commit 4084bf7ad2
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/init/openrc/docker.initd
View file

@ -13,7 +13,10 @@ start_pre() {
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
ulimit -n 1048576 ulimit -n 1048576
ulimit -u 1048576
# Having non-zero limits causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
ulimit -u unlimited
return 0 return 0
} }

2
contrib/init/systemd/docker.service
View file

@ -11,9 +11,9 @@ Type=notify
# for containers run by docker # for containers run by docker
ExecStart=/usr/bin/dockerd -H fd:// ExecStart=/usr/bin/dockerd -H fd://
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
LimitNOFILE=1048576
# Having non-zero Limit*s causes performance problems due to accounting overhead # Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting. # in the kernel. We recommend using cgroups to do container-local accounting.
LimitNOFILE=infinity
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
# Uncomment TasksMax if your systemd version supports it. # Uncomment TasksMax if your systemd version supports it.

7
contrib/init/sysvinit-debian/docker
View file

@ -94,10 +94,13 @@ case "$1" in
chgrp docker "$DOCKER_LOGFILE" chgrp docker "$DOCKER_LOGFILE"
ulimit -n 1048576 ulimit -n 1048576
# Having non-zero limits causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
if [ "$BASH" ]; then if [ "$BASH" ]; then
ulimit -u 1048576 ulimit -u unlimited
else else
ulimit -p 1048576 ulimit -p unlimited
fi fi
log_begin_msg "Starting $DOCKER_DESC: $BASE" log_begin_msg "Starting $DOCKER_DESC: $BASE"

6
contrib/init/upstart/docker.conf
View file

@ -2,8 +2,12 @@ description "Docker daemon"
start on (filesystem and net-device-up IFACE!=lo) start on (filesystem and net-device-up IFACE!=lo)
stop on runlevel [!2345] stop on runlevel [!2345]
limit nofile 524288 1048576 limit nofile 524288 1048576
limit nproc 524288 1048576
# Having non-zero limits causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
limit nproc unlimited unlimited
respawn respawn