From 5c0bb61d4d563c6877fc8afbb14f8ea877ed12ba Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 27 Apr 2016 14:03:38 -0700 Subject: [PATCH] app-emulation/docker: remove new TasksMax limit systemd 228 brings a default TasksMax of 512 which is almost certainly too low for Docker. This bumps it back up to infinity. --- .../docker/{docker-1.10.3.ebuild => docker-1.10.3-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/docker.service | 1 + .../app-emulation/docker/files/early-docker.service | 1 + 3 files changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.10.3.ebuild => docker-1.10.3-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index 2861852b3f..9cf02f6be9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -10,6 +10,7 @@ EnvironmentFile=-/run/flannel_docker_opts.env MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 +TasksMax=infinity ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ [Install] diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service index 3ef49fae25..dd73678f86 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service @@ -10,6 +10,7 @@ Environment=TMPDIR=/var/tmp MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 +TasksMax=infinity ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS [Install]