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

Merge pull request #771 from kinvolk/kai/containerd-default-socket

Browse Source 
app-emulation/containerd: Switch to default socket location
This commit is contained in:
Kai Lüke 2021-01-11 16:50:48 +01:00 committed by GitHub
commit 2c1655907e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml vendored
View File

@ -1,7 +1,7 @@
# persistent data location # persistent data location
root = "/var/lib/containerd" root = "/var/lib/containerd"
# runtime state information # runtime state information
state = "/run/docker/libcontainerd/containerd" state = "/run/containerd"
# set containerd as a subreaper on linux when it is not running as PID 1 # set containerd as a subreaper on linux when it is not running as PID 1
subreaper = true subreaper = true
# set containerd's OOM score # set containerd's OOM score
@ -10,7 +10,7 @@ disabled_plugins = []
# grpc configuration # grpc configuration
[grpc] [grpc]
address = "/run/docker/libcontainerd/docker-containerd.sock" address = "/run/containerd/containerd.sock"
# socket uid # socket uid
uid = 0 uid = 0
# socket gid # socket gid

5
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service vendored
View File

@ -6,9 +6,14 @@ After=network.target
[Service] [Service]
Delegate=yes Delegate=yes
Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml
ExecStartPre=mkdir -p /run/docker/libcontainerd
ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG} ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG}
KillMode=process KillMode=process
Type=notify
Restart=always Restart=always
RestartSec=5
# (lack of) limits from the upstream docker service unit # (lack of) limits from the upstream docker service unit
LimitNOFILE=1048576 LimitNOFILE=1048576