From 0758a718b002aa5c7aa71fc5b8912eaf91ff2c4e Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 7 May 2014 09:41:54 -0700 Subject: [PATCH 1/3] chore(app-emulation/docker): cleanout old ebuilds --- .../app-emulation/docker/docker-0.7.2.ebuild | 182 --------------- .../app-emulation/docker/docker-0.7.3.ebuild | 182 --------------- .../app-emulation/docker/docker-0.7.5.ebuild | 184 --------------- .../docker/docker-0.7.6-r1.ebuild | 180 --------------- .../app-emulation/docker/docker-0.7.6.ebuild | 184 --------------- .../app-emulation/docker/docker-0.8.0.ebuild | 189 --------------- .../docker/docker-0.8.1-r1.ebuild | 184 --------------- .../docker/docker-0.8.1-r2.ebuild | 187 --------------- .../app-emulation/docker/docker-0.8.1.ebuild | 180 --------------- .../docker/docker-0.9.0-r3.ebuild | 215 ------------------ .../app-emulation/docker/docker-0.9.0.ebuild | 211 ----------------- .../app-emulation/docker/docker-0.9.1.ebuild | 215 ------------------ 12 files changed, 2293 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.3.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.5.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0-r3.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.2.ebuild deleted file mode 100644 index 019bd65de5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.2.ebuild +++ /dev/null @@ -1,182 +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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="28b162e" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +device-mapper doc vim-syntax" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-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 - ~IP_NF_TARGET_MASQUERADE - ~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_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - 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" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - - udev_dorules contrib/udev/*.rules - - 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() { - udev_reload - - 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.7.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.3.ebuild deleted file mode 100644 index 49ff1560ed..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.3.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="8502ad4" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +device-mapper doc vim-syntax" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-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 - ~IP_NF_TARGET_MASQUERADE - ~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_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - 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" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - - udev_dorules contrib/udev/*.rules - - 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/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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.7.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.5.ebuild deleted file mode 100644 index 73bb6a5b7d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.5.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="c348c04" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-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 - ~IP_NF_TARGET_MASQUERADE - ~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_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - 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" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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.7.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6-r1.ebuild deleted file mode 100644 index 87f0859b60..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -SRC_URI="" -EGIT_REPO_URI="git://github.com/philips/docker.git" -DOCKER_GITCOMMIT="4031698e6c5fb1e50e78331f67a85d040528b19b" -EGIT_COMMIT="${DOCKER_GITCOMMIT}" -inherit git-2 -KEYWORDS="~amd64" - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-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 - ~IP_NF_TARGET_MASQUERADE - ~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_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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.7.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6.ebuild deleted file mode 100644 index e5386e7ea4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.7.6.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="bc3b2ec" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-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 - ~IP_NF_TARGET_MASQUERADE - ~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_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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.8.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.0.ebuild deleted file mode 100644 index c171cbcef1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.0.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="cc3a8c8" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - sys-fs/btrfs-progs - 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 - ~IP_NF_TARGET_MASQUERADE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~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 btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_compile() { - # eventually, perhaps Gentoo will include a "go" eclass to do some of this - - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - # make sure docker itself is in our shiny new GOPATH - mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die - ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die - - # we need our vendored deps, too - export GOPATH="$GOPATH:$(pwd -P)/vendor" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if gcc-specs-pie; then - sed -i 's/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die - grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed' - fi - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r1.ebuild deleted file mode 100644 index 5b27be3eda..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="a1598d1" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=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 - ~IP_NF_TARGET_MASQUERADE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - " - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_prepare() { - epatch "${FILESDIR}"/fix-api-serve-until-the-acceptconnections-job.patch -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOAPTH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if gcc-specs-pie; then - sed -i 's/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die - grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed' - fi - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r2.ebuild deleted file mode 100644 index 47b62b1ec3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1-r2.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="a1598d1" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=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 - ~IP_NF_TARGET_MASQUERADE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - " - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_prepare() { - epatch "${FILESDIR}"/fix-api-serve-until-the-acceptconnections-job.patch -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOAPTH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if gcc-specs-pie; then - sed -i 's/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die - grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed' - fi - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1.ebuild deleted file mode 100644 index 4b47a3a9d7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.8.1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2014 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/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="a1598d1" - KEYWORDS="~amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=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 - ~IP_NF_TARGET_MASQUERADE - ~MEMCG_SWAP - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - " - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOAPTH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - if gcc-specs-pie; then - sed -i 's/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die - grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed' - fi - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0-r3.ebuild deleted file mode 100644 index 077cc2decd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0-r3.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." -HOMEPAGE="https://www.docker.io/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="2b3fdf2" - KEYWORDS="amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc lxc vim-syntax zsh-completion symlink-usr" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - lxc? ( - >=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() { - # many of these were borrowed from the app-emulation/lxc ebuild - CONFIG_CHECK+=" - ~CGROUPS - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_SCHED - ~CPUSETS - ~MEMCG_SWAP - ~RESOURCE_COUNTERS - - ~IPC_NS - ~NAMESPACES - ~PID_NS - - ~DEVPTS_MULTIPLE_INSTANCES - ~MACVLAN - ~NET_NS - ~UTS_NS - ~VETH - - ~!NETPRIO_CGROUP - ~POSIX_MQUEUE - - ~BRIDGE - ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_PIVOT - " - - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do - declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable" - done - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOAPTH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 - - if use symlink-usr; then - systemd_dounit "${FILESDIR}/symlink-usr/docker.service" - else - systemd_dounit "${FILESDIR}/docker.service" - fi - systemd_dounit "${FILESDIR}/docker.socket" - - insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0.ebuild deleted file mode 100644 index ea7b30783c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.0.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." -HOMEPAGE="https://www.docker.io/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="2b3fdf2" - KEYWORDS="amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc lxc vim-syntax zsh-completion" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - lxc? ( - >=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() { - # many of these were borrowed from the app-emulation/lxc ebuild - CONFIG_CHECK+=" - ~CGROUPS - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_SCHED - ~CPUSETS - ~MEMCG_SWAP - ~RESOURCE_COUNTERS - - ~IPC_NS - ~NAMESPACES - ~PID_NS - - ~DEVPTS_MULTIPLE_INSTANCES - ~MACVLAN - ~NET_NS - ~UTS_NS - ~VETH - - ~!NETPRIO_CGROUP - ~POSIX_MQUEUE - - ~BRIDGE - ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_PIVOT - " - - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do - declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable" - done - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOAPTH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 "${FILESDIR}/docker.service" - systemd_dounit "${FILESDIR}/docker.socket" - - insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.1.ebuild deleted file mode 100644 index 83b4f17a00..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.9.1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." -HOMEPAGE="https://www.docker.io/" - -GITHUB_URI="github.com/dotcloud/docker" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - EGIT_REPO_URI="git://${GITHUB_URI}.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="3600720" - KEYWORDS="amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" -fi - -inherit bash-completion-r1 linux-info systemd udev user - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="aufs btrfs +device-mapper doc lxc vim-syntax zsh-completion symlink-usr" - -# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - sys-fs/lvm2[thin] -" -DEPEND=" - ${CDEPEND} - >=dev-lang/go-1.2 - >=sys-fs/btrfs-progs-0.20 - dev-vcs/git - dev-vcs/mercurial - doc? ( - dev-python/sphinx - dev-python/sphinxcontrib-httpdomain - ) -" -RDEPEND=" - ${CDEPEND} - !app-emulation/docker-bin - >=net-firewall/iptables-1.4 - lxc? ( - >=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() { - # many of these were borrowed from the app-emulation/lxc ebuild - CONFIG_CHECK+=" - ~CGROUPS - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_SCHED - ~CPUSETS - ~MEMCG_SWAP - ~RESOURCE_COUNTERS - - ~IPC_NS - ~NAMESPACES - ~PID_NS - - ~DEVPTS_MULTIPLE_INSTANCES - ~MACVLAN - ~NET_NS - ~UTS_NS - ~VETH - - ~!NETPRIO_CGROUP - ~POSIX_MQUEUE - - ~BRIDGE - ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT - ~NF_NAT_NEEDED - - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_PIVOT - " - - ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" - - for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do - declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable" - done - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_THIN_PROVISIONING - ~EXT4_FS - " - fi - - check_extra_config -} - -src_compile() { - # if we treat them right, Docker's build scripts will set up a - # reasonable GOPATH for us - export AUTO_GOPATH=1 - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/lib" - - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # time to build! - ./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 - - if use symlink-usr; then - systemd_dounit "${FILESDIR}/symlink-usr/docker.service" - else - systemd_dounit "${FILESDIR}/docker.service" - fi - systemd_dounit "${FILESDIR}/docker.socket" - - insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network - - udev_dorules contrib/udev/*.rules - - 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/* - - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - fi - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - fi - - insinto /usr/share/${P}/contrib - doins contrib/README - cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" -} - -pkg_postinst() { - udev_reload - - 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 "" -} From e094f65e4daf67e0df7086a8b7fd67f48c28e47b Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 7 May 2014 09:48:44 -0700 Subject: [PATCH 2/3] feat(app-emulation/docker): cros-workon'ify Use the symlink and -9999 pattern. This pull from crosbymichael's WIP 0.11.0 release branch but will make it easy to bump once the final release is in. --- .../app-emulation/docker/docker-0.11.0.ebuild | 1 + .../{docker-0.10.0.ebuild => docker-9999.ebuild} | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.0.ebuild rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-0.10.0.ebuild => docker-9999.ebuild} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.0.ebuild new file mode 120000 index 0000000000..5316ba320c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.0.ebuild @@ -0,0 +1 @@ +docker-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.10.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.10.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 8273ffdf5a..3728b47193 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.10.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -7,7 +7,11 @@ EAPI=5 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." HOMEPAGE="https://www.docker.io/" -GITHUB_URI="github.com/dotcloud/docker" +CROS_WORKON_PROJECT="crosbymichael/docker" +CROS_WORKON_LOCALNAME="docker" +CROS_WORKON_REPO="git://github.com" + +GITHUB_URI="github.com/crosbymichael/docker" if [[ ${PV} == *9999 ]]; then SRC_URI="" @@ -15,13 +19,13 @@ if [[ ${PV} == *9999 ]]; then inherit git-2 KEYWORDS="" else - SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" - DOCKER_GITCOMMIT="dc9c28f" + CROS_WORKON_COMMIT="78e702ab56a54750882cef1838ed74b1a84583a2" + DOCKER_GITCOMMIT="78e702a" KEYWORDS="amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi -inherit bash-completion-r1 linux-info systemd udev user +inherit bash-completion-r1 linux-info systemd udev user cros-workon LICENSE="Apache-2.0" SLOT="0" From 713c0591648c25e774c8c5e55d6fe71fdcff6d23 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 7 May 2014 11:56:59 -0700 Subject: [PATCH 3/3] bump(app-emulation/docker): docker-0.11.0 final --- .../app-emulation/docker/docker-9999.ebuild | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 3728b47193..53470a6515 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 @@ -7,7 +7,7 @@ EAPI=5 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." HOMEPAGE="https://www.docker.io/" -CROS_WORKON_PROJECT="crosbymichael/docker" +CROS_WORKON_PROJECT="dotcloud/docker" CROS_WORKON_LOCALNAME="docker" CROS_WORKON_REPO="git://github.com" @@ -19,10 +19,8 @@ if [[ ${PV} == *9999 ]]; then inherit git-2 KEYWORDS="" else - CROS_WORKON_COMMIT="78e702ab56a54750882cef1838ed74b1a84583a2" - DOCKER_GITCOMMIT="78e702a" + CROS_WORKON_COMMIT="15209c380c3f510e3f8d5ba1ff5fcc5cc8db3357" KEYWORDS="amd64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi inherit bash-completion-r1 linux-info systemd udev user cros-workon @@ -144,9 +142,6 @@ src_compile() { export CGO_CFLAGS="-I${ROOT}/usr/include" export CGO_LDFLAGS="-L${ROOT}/usr/lib" - # if we're building from a zip, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - # time to build! ./hack/make.sh dynbinary || die