From 0d18737adce7ff51f5b0565905366e7c45b796e7 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sat, 7 Dec 2013 21:45:45 -0800 Subject: [PATCH 1/3] fix(app-emulation/docker): start with a clean slate --- .../app-emulation/docker/Manifest | 1 - .../docker/docker-0.6.3-r1.ebuild | 164 ------------------ .../app-emulation/docker/docker-0.6.4.ebuild | 152 ---------------- .../app-emulation/docker/docker-0.6.5.ebuild | 151 ---------------- .../app-emulation/docker/docker-0.6.6.ebuild | 151 ---------------- .../app-emulation/docker/docker-0.6.7.ebuild | 151 ---------------- .../docker/files/docker-r2.confd | 18 -- .../docker/files/docker-r2.initd | 56 ------ .../docker/files/docker-r3.confd | 13 -- .../docker/files/docker-r3.initd | 31 ---- .../app-emulation/docker/files/docker.initd | 31 ---- .../app-emulation/docker/files/docker.service | 12 -- 12 files changed, 931 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.4.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.5.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.6.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.7.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.confd delete mode 100755 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.initd delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.confd delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.initd delete mode 100755 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.initd delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest deleted file mode 100644 index d1c6aa7c5b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST docker-0.5.3.tar.gz 1910016 SHA256 c6be25b6c91c985285b770c3c6ea35df0410fb13219191e7899365b256d9bb06 SHA512 2fba79d39cb12aa81372c7cf1c2cd881a555913c4fb0f63124255cfabc1fd8cda3b5e92183e1a76b5287a83b989958d8793f5254b626172d9c99325a7de35d43 WHIRLPOOL 4e5475fc5dfdd26c932a32fa9ae09191ddcc334d7149d202c284832368dd66148df8dad9e1da1b72f2481590ed46f5cb9f629e602815f50129b9831e1ab2d48d diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.3-r1.ebuild deleted file mode 100644 index f4850ad2e3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.3-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." -HOMEPAGE="http://www.docker.io/" -SRC_URI="" - -EGIT_REPO_URI="git://github.com/dotcloud/docker.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64" -fi - -inherit bash-completion-r1 git-2 linux-info systemd user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc vim-syntax" - -DEPEND=" - >=dev-lang/go-1.1.2 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - !app-emulation/lxc-docker-bin - >=app-arch/xz-utils-4.9 - >=app-arch/tar-1.26 - >=sys-apps/iproute2-3.5 - >=net-firewall/iptables-1.4 - >=app-emulation/lxc-0.8 - >=dev-vcs/git-1.7 - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) -" - -RESTRICT="strip" - -DOCKERFILE_VIM_S="${WORKDIR}/dockerfile.vim" - -# TODO AUFS will be replaced with device-mapper (sys-fs/lvm2[static-libs]) in 0.7 -ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" - -ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" - -pkg_setup() { - CONFIG_CHECK+=" ~AUFS_FS ~BRIDGE ~MEMCG_SWAP ~NETFILTER_XT_MATCH_ADDRTYPE ~NF_NAT ~NF_NAT_NEEDED" - check_extra_config -} - -src_unpack() { - git-2_src_unpack - - if use vim-syntax; then - ( # subshell to prevent environment leakage (and confusion of smart-live-rebuild) - EGIT_SOURCEDIR="${DOCKERFILE_VIM_S}" - EGIT_PROJECT="honza-dockerfile.vim.git" - EGIT_REPO_URI="https://github.com/honza/dockerfile.vim.git" - EGIT_MASTER="master" - EGIT_BRANCH="${EGIT_MASTER}" - EGIT_COMMIT="${EGIT_BRANCH}" - EGIT_NOUNPACK="true" - git-2_src_unpack - ) - fi -} - -src_compile() { - export CGO_ENABLED=0 # we need static linking! - - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # copy GOROOT so we can build it without cgo and not modify anything in the REAL_GOROOT - REAL_GOROOT="$(go env GOROOT)" - export GOROOT="${WORKDIR}/goroot" - rm -rf "$GOROOT" || die - cp -R "$REAL_GOROOT" "$GOROOT" || die - - # recompile GOROOT to be cgo-less and thus static-able (especially net package) - go install -a -v std || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/github.com/dotcloud" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # time to build! - ./hack/make.sh binary || die - - # now copy the binary to a consistent location that doesn't involve the current version number - mkdir -p bin || die - VERSION=$(cat ./VERSION) - cp -v bundles/$VERSION/binary/docker-$VERSION bin/docker || die - - if use doc; then - emake -C docs docs man || die - fi -} - -src_install() { - dobin bin/docker - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md MAINTAINERS NOTICE README.md - - newinitd "${FILESDIR}/docker-r2.initd" docker - newconfd "${FILESDIR}/docker-r2.confd" docker - - systemd_dounit "${FILESDIR}/docker.service" - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" - - newbashcomp contrib/docker.bash docker - - if use doc; then - dohtml -r docs/_build/html/* - doman docs/_build/man/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${DOCKERFILE_VIM_S}/ftdetect" - doins -r "${DOCKERFILE_VIM_S}/syntax" - fi -} - -pkg_postinst() { - elog "" - elog "To use docker, the docker daemon must be running as root. To automatically" - elog "start the docker daemon at boot, add docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use docker as a non-root user, add yourself to the docker group." - elog "" - - ewarn "" - ewarn "If you want your containers to have access to the public internet or even" - ewarn "the existing private network, IP Forwarding must be enabled:" - ewarn " sysctl -w net.ipv4.ip_forward=1" - ewarn "or more permanently:" - ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" - ewarn "Please be mindful of the security implications of enabling IP Forwarding." - ewarn "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.4.ebuild deleted file mode 100644 index 7c2b4cb307..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.4.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." -HOMEPAGE="http://www.docker.io/" -SRC_URI="" - -EGIT_REPO_URI="git://github.com/dotcloud/docker.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64" -fi - -inherit bash-completion-r1 git-2 linux-info systemd user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc vim-syntax" - -DEPEND=" - >=dev-lang/go-1.1.2 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - !app-emulation/lxc-docker-bin - >=app-arch/tar-1.26 - >=sys-apps/iproute2-3.5 - >=net-firewall/iptables-1.4 - >=app-emulation/lxc-0.8 - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) -" - -RESTRICT="strip" - -# TODO AUFS will be replaced with device-mapper (sys-fs/lvm2[static-libs]) in 0.7 -ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" - -ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" - -pkg_setup() { - CONFIG_CHECK+=" ~AUFS_FS ~BRIDGE ~MEMCG_SWAP ~NETFILTER_XT_MATCH_ADDRTYPE ~NF_NAT ~NF_NAT_NEEDED" - check_extra_config -} - -src_unpack() { - git-2_src_unpack -} - -src_compile() { - export CGO_ENABLED=0 # we need static linking! - - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # copy GOROOT so we can build it without cgo and not modify anything in the REAL_GOROOT - REAL_GOROOT="$(go env GOROOT)" - export GOROOT="${WORKDIR}/goroot" - rm -rf "$GOROOT" || die - cp -R "$REAL_GOROOT" "$GOROOT" || die - - # recompile GOROOT to be cgo-less and thus static-able (especially net package) - go install -a -v std || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/github.com/dotcloud" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # time to build! - ./hack/make.sh binary || die - - # now copy the binary to a consistent location that doesn't involve the current version number - mkdir -p bin || die - VERSION=$(cat ./VERSION) - cp -v bundles/$VERSION/binary/docker-$VERSION bin/docker || die - - if use doc; then - emake -C docs docs man || die - fi -} - -src_install() { - dobin bin/docker - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md MAINTAINERS NOTICE README.md - - newinitd "${FILESDIR}/docker-r3.initd" docker - newconfd "${FILESDIR}/docker-r3.confd" docker - - systemd_dounit "${FILESDIR}/docker.service" - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" - - if use doc; then - dohtml -r docs/_build/html/* - doman docs/_build/man/* - fi - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/vim-syntax/ftdetect - doins -r contrib/vim-syntax/syntax - fi -} - -pkg_postinst() { - elog "" - elog "To use docker, the docker daemon must be running as root. To automatically" - elog "start the docker daemon at boot, add docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use docker as a non-root user, add yourself to the docker group." - elog "" - - ewarn "" - ewarn "If you want your containers to have access to the public internet or even" - ewarn "the existing private network, IP Forwarding must be enabled:" - ewarn " sysctl -w net.ipv4.ip_forward=1" - ewarn "or more permanently:" - ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" - ewarn "Please be mindful of the security implications of enabling IP Forwarding." - ewarn "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.5.ebuild deleted file mode 100644 index fd4063f3fc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.5.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." -HOMEPAGE="http://www.docker.io/" -SRC_URI="" - -EGIT_REPO_URI="git://github.com/dotcloud/docker.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64" -fi - -inherit bash-completion-r1 git-2 linux-info systemd user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc vim-syntax" - -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.1.2 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/lxc-docker-bin - >=app-arch/tar-1.26 - >=sys-apps/iproute2-3.5 - >=net-firewall/iptables-1.4 - >=app-emulation/lxc-0.8 - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) -" - -RESTRICT="strip" - -CONFIG_CHECK=" - ~AUFS_FS - ~BRIDGE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NF_NAT - ~NF_NAT_NEEDED -" - -# TODO AUFS will be replaced with device-mapper (requires sys-fs/lvm2[thin]) in 0.7 -ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" - -ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" - -pkg_setup() { - check_extra_config -} - -src_unpack() { - git-2_src_unpack -} - -src_compile() { - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/github.com/dotcloud" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # time to build! - ./hack/make.sh dynbinary || die - - if use doc; then - emake -C docs docs || die - fi -} - -src_install() { - VERSION=$(cat VERSION) - newbin bundles/$VERSION/dynbinary/docker-$VERSION docker - exeinto /usr/libexec/docker - newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.service - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - if use doc; then - dohtml -r docs/_build/html/* - fi - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/vim-syntax/ftdetect - doins -r contrib/vim-syntax/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - elog "" - elog "To use docker, the docker daemon must be running as root. To automatically" - elog "start the docker daemon at boot, add docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use docker as a non-root user, add yourself to the docker group." - elog "" - - ewarn "" - ewarn "If you want your containers to have access to the public internet or even" - ewarn "the existing private network, IP Forwarding must be enabled:" - ewarn " sysctl -w net.ipv4.ip_forward=1" - ewarn "or more permanently:" - ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" - ewarn "Please be mindful of the security implications of enabling IP Forwarding." - ewarn "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.6.ebuild deleted file mode 100644 index fd4063f3fc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.6.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." -HOMEPAGE="http://www.docker.io/" -SRC_URI="" - -EGIT_REPO_URI="git://github.com/dotcloud/docker.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64" -fi - -inherit bash-completion-r1 git-2 linux-info systemd user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc vim-syntax" - -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.1.2 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/lxc-docker-bin - >=app-arch/tar-1.26 - >=sys-apps/iproute2-3.5 - >=net-firewall/iptables-1.4 - >=app-emulation/lxc-0.8 - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) -" - -RESTRICT="strip" - -CONFIG_CHECK=" - ~AUFS_FS - ~BRIDGE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NF_NAT - ~NF_NAT_NEEDED -" - -# TODO AUFS will be replaced with device-mapper (requires sys-fs/lvm2[thin]) in 0.7 -ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" - -ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" - -pkg_setup() { - check_extra_config -} - -src_unpack() { - git-2_src_unpack -} - -src_compile() { - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/github.com/dotcloud" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # time to build! - ./hack/make.sh dynbinary || die - - if use doc; then - emake -C docs docs || die - fi -} - -src_install() { - VERSION=$(cat VERSION) - newbin bundles/$VERSION/dynbinary/docker-$VERSION docker - exeinto /usr/libexec/docker - newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.service - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - if use doc; then - dohtml -r docs/_build/html/* - fi - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/vim-syntax/ftdetect - doins -r contrib/vim-syntax/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - elog "" - elog "To use docker, the docker daemon must be running as root. To automatically" - elog "start the docker daemon at boot, add docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use docker as a non-root user, add yourself to the docker group." - elog "" - - ewarn "" - ewarn "If you want your containers to have access to the public internet or even" - ewarn "the existing private network, IP Forwarding must be enabled:" - ewarn " sysctl -w net.ipv4.ip_forward=1" - ewarn "or more permanently:" - ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" - ewarn "Please be mindful of the security implications of enabling IP Forwarding." - ewarn "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.7.ebuild deleted file mode 100644 index fd4063f3fc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.6.7.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." -HOMEPAGE="http://www.docker.io/" -SRC_URI="" - -EGIT_REPO_URI="git://github.com/dotcloud/docker.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64" -fi - -inherit bash-completion-r1 git-2 linux-info systemd user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc vim-syntax" - -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.1.2 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/lxc-docker-bin - >=app-arch/tar-1.26 - >=sys-apps/iproute2-3.5 - >=net-firewall/iptables-1.4 - >=app-emulation/lxc-0.8 - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - || ( - sys-fs/aufs3 - sys-kernel/aufs-sources - ) -" - -RESTRICT="strip" - -CONFIG_CHECK=" - ~AUFS_FS - ~BRIDGE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NF_NAT - ~NF_NAT_NEEDED -" - -# TODO AUFS will be replaced with device-mapper (requires sys-fs/lvm2[thin]) in 0.7 -ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" - -ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" - -pkg_setup() { - check_extra_config -} - -src_unpack() { - git-2_src_unpack -} - -src_compile() { - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/github.com/dotcloud" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # time to build! - ./hack/make.sh dynbinary || die - - if use doc; then - emake -C docs docs || die - fi -} - -src_install() { - VERSION=$(cat VERSION) - newbin bundles/$VERSION/dynbinary/docker-$VERSION docker - exeinto /usr/libexec/docker - newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.service - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - if use doc; then - dohtml -r docs/_build/html/* - fi - - dobashcomp contrib/completion/bash/* - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/vim-syntax/ftdetect - doins -r contrib/vim-syntax/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - elog "" - elog "To use docker, the docker daemon must be running as root. To automatically" - elog "start the docker daemon at boot, add docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog "" - - # create docker group if the code checking for it in /etc/group exists - enewgroup docker - - elog "To use docker as a non-root user, add yourself to the docker group." - elog "" - - ewarn "" - ewarn "If you want your containers to have access to the public internet or even" - ewarn "the existing private network, IP Forwarding must be enabled:" - ewarn " sysctl -w net.ipv4.ip_forward=1" - ewarn "or more permanently:" - ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" - ewarn "Please be mindful of the security implications of enabling IP Forwarding." - ewarn "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.confd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.confd deleted file mode 100644 index 5436b2339d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.confd +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/conf.d/docker: config file for /etc/init.d/docker - -# where the docker daemon output gets piped -#DOCKER_LOGFILE="/var/log/docker.log" - -# where docker's pid get stored -#DOCKER_PIDFILE="/run/docker.pid" - -# where the docker daemon itself is run from -#DOCKER_BINARY="/usr/bin/docker" - -# uncomment this for a simple workaround to -# https://github.com/dotcloud/docker/issues/1422 -#DOCKER_WORKAROUND_1422="1" - -# if you find that the default DOCKER_WORKAROUND_1422 delay of one second -# is not sufficient, try uncommenting and increasing this value -#DOCKER_WORKAROUND_1422_DELAY="1" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.initd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.initd deleted file mode 100755 index e74ad7d99c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r2.initd +++ /dev/null @@ -1,56 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker-r2.initd,v 1.1 2013/09/25 03:22:15 gregkh Exp $ - -DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log} -DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid} -DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} -DOCKER_WORKAROUND_1422=${DOCKER_WORKAROUND_1422:-0} -DOCKER_WORKAROUND_1422_DELAY=${DOCKER_WORKAROUND_1422_DELAY:-1} - -start() { - touch "$DOCKER_LOGFILE" - chown root:docker "$DOCKER_LOGFILE" - chmod 0644 "$DOCKER_LOGFILE" - - ebegin "Starting docker daemon" - start-stop-daemon --start --background \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" \ - --stdout "$DOCKER_LOGFILE" \ - --stderr "$DOCKER_LOGFILE" \ - -- -d -p "$DOCKER_PIDFILE" - eend $? - ret=$? - - if [ $ret -eq 0 ] \ - && [ "$DOCKER_WORKAROUND_1422" ] \ - && [ "$DOCKER_WORKAROUND_1422" -gt 0 ] \ - ; then - # see https://github.com/dotcloud/docker/issues/1422 - ewarn "Working around gh#1422 (via busybox image); this may take a moment" - - # we were calling "docker run" more quickly than "docker -d" could get - # fired up, so our workaround wasn't successful without a short delay - sleep $DOCKER_WORKAROUND_1422_DELAY - - # TODO when we get https://github.com/dotcloud/docker/pull/1589, these - # both need -rm so we clean up after ourselves (thanks, @eliasp!) - docker run -i -t busybox true &> /dev/null || true - # first run will fail, so we ignore its output and result and run again - docker run -i -t busybox true - - ewend $? - fi - - return $ret -} - -stop() { - ebegin "Stopping docker daemon" - start-stop-daemon --stop \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" - eend $? -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.confd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.confd deleted file mode 100644 index ae247c007e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.confd +++ /dev/null @@ -1,13 +0,0 @@ -# /etc/conf.d/docker: config file for /etc/init.d/docker - -# where the docker daemon output gets piped -#DOCKER_LOGFILE="/var/log/docker.log" - -# where docker's pid get stored -#DOCKER_PIDFILE="/run/docker.pid" - -# where the docker daemon itself is run from -#DOCKER_BINARY="/usr/bin/docker" - -# any other random options you want to pass to docker -DOCKER_OPTS="" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.initd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.initd deleted file mode 100644 index 2d79a73973..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-r3.initd +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log} -DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid} -DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} -DOCKER_OPTS=${DOCKER_OPTS:-} - -start() { - checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" - - ebegin "Starting docker daemon" - start-stop-daemon --start --background \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" \ - --stdout "$DOCKER_LOGFILE" \ - --stderr "$DOCKER_LOGFILE" \ - -- -d -p "$DOCKER_PIDFILE" \ - $DOCKER_OPTS - eend $? -} - -stop() { - ebegin "Stopping docker daemon" - start-stop-daemon --stop \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" - eend $? -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.initd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.initd deleted file mode 100755 index 55f2277ad5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.initd +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker.initd,v 1.1 2013/09/25 03:22:15 gregkh Exp $ - -DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log} -DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid} -DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} - -start() { - touch "$DOCKER_LOGFILE" - chown root:docker "$DOCKER_LOGFILE" - chmod 0644 "$DOCKER_LOGFILE" - - ebegin "Starting docker daemon" - start-stop-daemon --start --background \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" \ - --stdout "$DOCKER_LOGFILE" \ - --stderr "$DOCKER_LOGFILE" \ - -- -d -p "$DOCKER_PIDFILE" - eend $? -} - -stop() { - ebegin "Stopping docker daemon" - start-stop-daemon --stop \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" - eend $? -} 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 deleted file mode 100644 index dde89a214a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Easily create lightweight, portable, self-sufficient containers from any application! -Requires=network.target -After=multi-user.target - -[Service] -Type=simple -ExecStartPre=/bin/mount --make-rprivate / -ExecStart=/usr/bin/docker -d - -[Install] -WantedBy=multi-user.target From 22f3f5b953632ff42d8e1befda19a7744790ebef Mon Sep 17 00:00:00 2001 From: unclejack Date: Sat, 7 Dec 2013 02:13:22 +0200 Subject: [PATCH 2/3] feat(app-emulation/docker): bump to docker 0.7.1 --- .../app-emulation/docker/docker-0.7.1.ebuild | 169 ++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild new file mode 100644 index 0000000000..29532ca0fa --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.7.0.ebuild,v 1.1 2013/11/26 15:17:48 gregkh Exp $ + +EAPI=5 + +DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." +HOMEPAGE="http://www.docker.io/" +SRC_URI="" + +EGIT_REPO_URI="git://github.com/dotcloud/docker.git" +if [[ ${PV} == *9999 ]]; then + KEYWORDS="" +else + EGIT_COMMIT="v${PV}" + KEYWORDS="~amd64" +fi + +inherit bash-completion-r1 git-2 linux-info systemd user + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="aufs +device-mapper doc vim-syntax" + +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + sys-fs/lvm2[thin] + ) +" +DEPEND=" + ${CDEPEND} + >=dev-lang/go-1.1.2 + dev-vcs/git + dev-vcs/mercurial + doc? ( + dev-python/sphinx + dev-python/sphinxcontrib-httpdomain + ) +" +RDEPEND=" + ${CDEPEND} + !app-emulation/docker-bin + >=app-arch/tar-1.26 + >=sys-apps/iproute2-3.5 + >=net-firewall/iptables-1.4 + >=app-emulation/lxc-0.8 + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + aufs? ( + || ( + sys-fs/aufs3 + sys-kernel/aufs-sources + ) + ) +" + +RESTRICT="strip" + +pkg_setup() { + CONFIG_CHECK+=" + ~BRIDGE + ~MEMCG_SWAP + ~NETFILTER_XT_MATCH_ADDRTYPE + ~NF_NAT + ~NF_NAT_NEEDED + " + ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + " + ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_THIN_PROVISIONING + ~EXT4_FS + " + fi + + check_extra_config +} + +src_unpack() { + git-2_src_unpack +} + +src_compile() { + export GOPATH="${WORKDIR}/gopath" + mkdir -p "$GOPATH" || die + + # make sure docker itself is in our shiny new GOPATH + mkdir -p "${GOPATH}/src/github.com/dotcloud" || die + ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die + + # we need our vendored deps, too + export GOPATH="$GOPATH:$(pwd -P)/vendor" + + # time to build! + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/lib" + ./hack/make.sh dynbinary || die + + if use doc; then + emake -C docs docs man || die + fi +} + +src_install() { + VERSION=$(cat VERSION) + newbin bundles/$VERSION/dynbinary/docker-$VERSION docker + exeinto /usr/libexec/docker + newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.service + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + if use doc; then + dohtml -r docs/_build/html/* + doman docs/_build/man/* + fi + + dobashcomp contrib/completion/bash/* + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles + doins -r contrib/vim-syntax/ftdetect + doins -r contrib/vim-syntax/syntax + fi + + insinto /usr/share/${P}/contrib + doins contrib/README + cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" +} + +pkg_postinst() { + elog "" + elog "To use docker, the docker daemon must be running as root. To automatically" + elog "start the docker daemon at boot, add docker to the default runlevel:" + elog " rc-update add docker default" + elog "Similarly for systemd:" + elog " systemctl enable docker.service" + elog "" + + # create docker group if the code checking for it in /etc/group exists + enewgroup docker + + elog "To use docker as a non-root user, add yourself to the docker group." + elog "" + + ewarn "" + ewarn "If you want your containers to have access to the public internet or even" + ewarn "the existing private network, IP Forwarding must be enabled:" + ewarn " sysctl -w net.ipv4.ip_forward=1" + ewarn "or more permanently:" + ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" + ewarn "Please be mindful of the security implications of enabling IP Forwarding." + ewarn "" +} From 09b4f916333d009c3b5999c8673eb88b38e95730 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sat, 7 Dec 2013 21:52:15 -0800 Subject: [PATCH 3/3] feat(app-emulation/docker): use the coreos unit file On CoreOS we use systemd to manage docker containers. Having docker automatically start containers on reboot makes everything confused. Stop doing this. --- .../app-emulation/docker/docker-0.7.1.ebuild | 2 +- .../app-emulation/docker/files/docker.service | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild index 29532ca0fa..8a0797dd55 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.1.ebuild @@ -119,7 +119,7 @@ src_install() { newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker - systemd_dounit contrib/init/systemd/docker.service + systemd_dounit "${FILESDIR}/docker.service" dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md if use doc; then 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 new file mode 100644 index 0000000000..6e2067a17f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service @@ -0,0 +1,13 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=http://docs.docker.io +After=network.target + +[Service] +ExecStartPre=/bin/mount --make-rprivate / +# Run docker but don't have docker automatically restart +# containers. This is a job for systemd and unit files. +ExecStart=/usr/bin/docker -d -r=false + +[Install] +WantedBy=multi-user.target