app-emulation/containerd: add restart directive to unit

Containerd can crash and should be restarted if it does.
This commit is contained in:
Andrew Jeddeloh 2017-08-11 13:45:56 -07:00
parent a40bf5e3ea
commit 0b87be2486
8 changed files with 7 additions and 6 deletions

View File

@ -5,6 +5,7 @@ Documentation=http://github.com/docker/containerd
[Service] [Service]
Type=simple Type=simple
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 # (lack of) limits from the upstream docker service unit
LimitNOFILE=1048576 LimitNOFILE=1048576

View File

@ -61,7 +61,7 @@ RDEPEND="
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
>=sys-apps/shadow-4.4 >=sys-apps/shadow-4.4
=app-emulation/containerd-0.2.5-r2[seccomp?] =app-emulation/containerd-0.2.5-r3[seccomp?]
=app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?] =app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?]
" "

View File

@ -61,7 +61,7 @@ RDEPEND="
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
>=sys-apps/shadow-4.4 >=sys-apps/shadow-4.4
>=app-emulation/containerd-0.2.7_p2[seccomp?] >=app-emulation/containerd-0.2.7_p2-r1[seccomp?]
=app-emulation/runc-1.0.0_rc2_p137[apparmor?,seccomp?] =app-emulation/runc-1.0.0_rc2_p137[apparmor?,seccomp?]
app-emulation/docker-proxy app-emulation/docker-proxy
container-init? ( >=sys-process/tini-0.13.1 ) container-init? ( >=sys-process/tini-0.13.1 )

View File

@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
=app-emulation/docker-1.12.6-r5 =app-emulation/docker-1.12.6-r6
=app-emulation/containerd-0.2.5-r2 =app-emulation/containerd-0.2.5-r3
=app-emulation/runc-1.0.0_rc2_p9 =app-emulation/runc-1.0.0_rc2_p9
" "

View File

@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
=app-emulation/docker-17.05.0 =app-emulation/docker-17.05.0-r1
=app-emulation/containerd-0.2.7_p2 =app-emulation/containerd-0.2.7_p2-r1
=app-emulation/docker-proxy-0.8.0_p20170410 =app-emulation/docker-proxy-0.8.0_p20170410
=app-emulation/runc-1.0.0_rc2_p137 =app-emulation/runc-1.0.0_rc2_p137
=sys-process/tini-0.13.2 =sys-process/tini-0.13.2