From 93ca3af591a5d160cc2f143cc27bbd98b00cf9ba Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 13 Mar 2017 10:58:01 -0700 Subject: [PATCH] app-emulation/containerd: use the upstream default timeout This also bumps the Docker revisions since it has dependencies on exact versions now. --- ...ntainerd-0.2.3_p85.ebuild => containerd-0.2.3_p85-r1.ebuild} | 0 .../{containerd-0.2.5.ebuild => containerd-0.2.5-r1.ebuild} | 0 .../app-emulation/containerd/files/containerd.service | 2 +- .../docker/{docker-1.12.6.ebuild => docker-1.12.6-r1.ebuild} | 2 +- .../docker/{docker-1.13.1-r2.ebuild => docker-1.13.1-r3.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-0.2.3_p85.ebuild => containerd-0.2.3_p85-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-0.2.5.ebuild => containerd-0.2.5-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.6.ebuild => docker-1.12.6-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.13.1-r2.ebuild => docker-1.13.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd.service index 45889a7e6c..38ceb2e31c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd.service @@ -4,7 +4,7 @@ Documentation=http://github.com/docker/containerd [Service] 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 LimitNOFILE=1048576 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild index 87106e15b9..919d7fefb5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild @@ -61,7 +61,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=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?] " diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 4ba538e89b..62db511804 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -66,7 +66,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=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/docker-proxy "