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

Merge pull request #866 from krishjainx/patch-2

Browse Source 
Migrate to Type=notify
This commit is contained in:
Dongsu Park 2023-06-15 17:53:13 +02:00 committed by GitHub
commit 54eb0f2ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/changes/2023-06-15-containerd-service Normal file
View File

@ -0,0 +1 @@
- Migrate to Type=notify in containerd.service. Changed the unit to Type=notify, utilizing the existing containerd support for sd_notify call after socket setup.

22
sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/containerd.service vendored
View File

@ -1,20 +1,24 @@
[Unit] [Unit]
Description=Containerd Container Daemon Description=containerd container runtime
Documentation=http://github.com/docker/containerd Documentation=https://containerd.io
After=network.target local-fs.target
[Service] [Service]
Type=simple ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/bin/containerd --listen unix:///var/run/docker/libcontainerd/docker-containerd.sock --shim /usr/bin/containerd-shim --state-dir /var/run/docker/libcontainerd/containerd --start-timeout 2m ExecStart=/usr/bin/containerd --listen unix:///var/run/docker/libcontainerd/docker-containerd.sock --shim /usr/bin/containerd-shim --state-dir /var/run/docker/libcontainerd/containerd --start-timeout 2m
Restart=always
# (lack of) limits from the upstream docker service unit Type=notify
LimitNOFILE=1048576 Delegate=yes
KillMode=process
Restart=always
RestartSec=5
# 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 LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
LimitNOFILE=infinity
TasksMax=infinity TasksMax=infinity
OOMScoreAdjust=-999
# set delegate yes so that systemd does not reset the cgroups of containers
Delegate=yes
[Install] [Install]
WantedBy=multi-user.target early-docker.target WantedBy=multi-user.target early-docker.target