diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.7_p2-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 38ceb2e31c..5af2182266 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 @@ -5,6 +5,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 --start-timeout 2m +Restart=always # (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-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild index 4fd32b6442..e968422ad2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild @@ -61,7 +61,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=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?] " diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.05.0-r1.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 e75c063628..156995c21d 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 @@ -61,7 +61,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=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/docker-proxy container-init? ( >=sys-process/tini-0.13.1 ) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild index 2878868b25..3a06df6af3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild @@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-1.12.6-r5 - =app-emulation/containerd-0.2.5-r2 + =app-emulation/docker-1.12.6-r6 + =app-emulation/containerd-0.2.5-r3 =app-emulation/runc-1.0.0_rc2_p9 " diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.05.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.05.ebuild index 8cbbc4830e..1e41cec4ad 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.05.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.05.ebuild @@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-17.05.0 - =app-emulation/containerd-0.2.7_p2 + =app-emulation/docker-17.05.0-r1 + =app-emulation/containerd-0.2.7_p2-r1 =app-emulation/docker-proxy-0.8.0_p20170410 =app-emulation/runc-1.0.0_rc2_p137 =sys-process/tini-0.13.2