fix(app-emulation/docker): Remove old ebuilds, remove sysctl call.

ipv4 forwarding is now enabled in coreos-base via a sysctl config.
This commit is contained in:
Michael Marineau 2013-08-22 20:30:01 -04:00
parent cd40d3e46b
commit 073071a627
4 changed files with 0 additions and 47 deletions

View File

@ -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
}

View File

@ -1,9 +1,6 @@
[Service] [Service]
Type=simple Type=simple
ExecStartPre=/bin/mount --make-rprivate / 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: # 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 &" # ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &"