mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 23:41:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: sync systemd services with upstream

Browse Source
This commit is contained in:
Nick Owens 2016-08-11 15:08:11 -07:00
parent e58c75a8be
commit 8fc569eafa
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1-r2.ebuild vendored
View File

18
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -5,11 +5,25 @@ After=docker.socket early-docker.target network.target
Requires=docker.socket early-docker.target Requires=docker.socket early-docker.target
[Service] [Service]
Type=notify
EnvironmentFile=-/run/flannel_docker_opts.env EnvironmentFile=-/run/flannel_docker_opts.env
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 # the default is not to use systemd for cgroups because the delegate issues still
LimitNPROC=1048576 # exists and systemd currently does not support the cgroup feature set required
# for containers run by docker
ExecStart=/usr/lib/coreos/dockerd --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ ExecStart=/usr/lib/coreos/dockerd --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
ExecReload=/bin/kill -s HUP $MAINPID
LimitNOFILE=1048576
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC=infinity
LimitCORE=infinity
# Uncomment TasksMax if your systemd version supports it.
# Only systemd 226 and above support this version.
TasksMax=infinity
TimeoutStartSec=0
# set delegate yes so that systemd does not reset the cgroups of docker containers
Delegate=yes
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

18
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service vendored
View File

@ -5,11 +5,25 @@ After=early-docker.socket
Requires=early-docker.socket Requires=early-docker.socket
[Service] [Service]
Type=notify
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 # the default is not to use systemd for cgroups because the delegate issues still
LimitNPROC=1048576 # exists and systemd currently does not support the cgroup feature set required
# for containers run by docker
ExecStart=/usr/lib/coreos/dockerd --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS ExecStart=/usr/lib/coreos/dockerd --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS
ExecReload=/bin/kill -s HUP $MAINPID
LimitNOFILE=1048576
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC=infinity
LimitCORE=infinity
# Uncomment TasksMax if your systemd version supports it.
# Only systemd 226 and above support this version.
TasksMax=infinity
TimeoutStartSec=0
# set delegate yes so that systemd does not reset the cgroups of docker containers
Delegate=yes
[Install] [Install]
WantedBy=early-docker.target WantedBy=early-docker.target