diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0-r1.ebuild deleted file mode 120000 index 767049c357..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -docker-0.5.0.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0.ebuild deleted file mode 100644 index dc0652ad5d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 -# $Header:$ -# - -EAPI=2 -EGIT_REPO_URI="https://github.com/dotcloud/docker" -inherit toolchain-funcs systemd git-2 - -EGIT_COMMIT="51f6c4a7372450d164c61e0054daf0223ddbd909" # 0.5 - -DESCRIPTION="Docker container management" -HOMEPAGE="http://docker.io" -SRC_URI="" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND=">=dev-lang/go-1.0.2" -RDEPEND=" - app-emulation/lxc - net-misc/bridge-utils - sys-apps/iproute2 - app-arch/libarchive - net-misc/curl - sys-fs/aufs-util -" - -src_compile() { - emake -} - -src_install() { - dobin ${S}/bin/${PN} - keepdir /var/lib/${PN}/graph - keepdir /var/lib/${PN}/containers - systemd_dounit "${FILESDIR}"/${PN}.service - # not enabling by default because it messes up the EC2 169. meta url routing - systemd_enable_service multi-user.target ${PN}.service -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.5.3-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service index 119fa86376..e01e0a4e33 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -1,9 +1,6 @@ [Service] Type=simple ExecStartPre=/bin/mount --make-rprivate / -# Enable forwarding to allow NAT to work -# TODO: Move this to sysctl.conf -ExecStartPre=/sbin/sysctl -w net.ipv4.ip_forward=1 # Try to use this alternate way of starting docker if docker crashes for you: # ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &"