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

Merge pull request #2416 from dm0-/containerd-opts

Browse Source 
app-emulation/containerd: use the upstream default timeout
This commit is contained in:
David Michael 2017-03-14 17:10:11 -07:00 committed by GitHub
commit 081582f146
6 changed files with 3 additions and 3 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/containerd/containerd-0.2.3_p85.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85-r1.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild vendored
View File

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

@ -4,7 +4,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 --runtime /usr/bin/runc 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
# (lack of) limits from the upstream docker service unit # (lack of) limits from the upstream docker service unit
LimitNOFILE=1048576 LimitNOFILE=1048576

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild vendored
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[seccomp?] =app-emulation/containerd-0.2.5-r1[seccomp?]
=app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?] =app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?]
" "

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

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -66,7 +66,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.3_p85[seccomp?] =app-emulation/containerd-0.2.3_p85-r1[seccomp?]
=app-emulation/runc-1.0.0_rc2_p133[apparmor?,seccomp?] =app-emulation/runc-1.0.0_rc2_p133[apparmor?,seccomp?]
app-emulation/docker-proxy app-emulation/docker-proxy
" "