diff options
author | Greg Kroah-Hartman <gregkh@gentoo.org> | 2013-11-11 06:19:06 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@gentoo.org> | 2013-11-11 06:19:06 +0000 |
commit | 1d4bfaad7eb6b8e0a82e55d1424e256629616115 (patch) | |
tree | 27f0e7049939737f20a7d626b7155cd0a150fdf2 /app-emulation | |
parent | Version bump. (diff) | |
download | historical-1d4bfaad7eb6b8e0a82e55d1424e256629616115.tar.gz historical-1d4bfaad7eb6b8e0a82e55d1424e256629616115.tar.bz2 historical-1d4bfaad7eb6b8e0a82e55d1424e256629616115.zip |
0.6.6 version bump
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/docker/ChangeLog | 7 | ||||
-rw-r--r-- | app-emulation/docker/Manifest | 3 | ||||
-rw-r--r-- | app-emulation/docker/docker-0.6.6.ebuild | 151 |
3 files changed, 159 insertions, 2 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 155c71d7d131..efc2d4388099 100644 --- a/app-emulation/docker/ChangeLog +++ b/app-emulation/docker/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.3 2013/10/31 20:47:50 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.4 2013/11/11 06:19:00 gregkh Exp $ + +*docker-0.6.6 (11 Nov 2013) + + 11 Nov 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.6.6.ebuild: + 0.6.6 version bump *docker-0.6.5 (31 Oct 2013) diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index ce0efffe8e43..dc1b3de79131 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -5,5 +5,6 @@ AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6 EBUILD docker-0.6.3-r1.ebuild 4432 SHA256 22602753383c95c36105593fb0dbe35a69b18cf02c6694590a94c097da985434 SHA512 a4a923b085368be7f6339f461fc037c38fb6b465cadf4e7264c4f3806b3b46713f85ac5b77bf3d469eebaa91f3d3e22ea3ec275abe38686b3004a7acf6b967cd WHIRLPOOL 74082aca50521ca405994ed15e04b9fc8f1c8485a7a0e00af6bb47c717dd3ea35341d946d88a01148fd8c23d083ed4fe1d73be33de92547cdbafa3d2183f0001 EBUILD docker-0.6.3.ebuild 4404 SHA256 2e38617c57dfe48c270f026c7870de2b83abcfb4d07c40537e5672f389fe630b SHA512 ab108c310a1fd017bf18446ff490b6699d3503b4efcaaba809acee6f4a70be35aea119268ece608111c614f1a214324319af6673bddc0377debc92dd6345ca86 WHIRLPOOL f6dcc4dcffa7d9bee4a74a9f819ca461c68e9ec779818da0bc311ecb1ad5b8b74e6df4c9612b6dd8d6d33e04d55c6c87818491042d1fc00cdd5577a004e6163e EBUILD docker-0.6.5.ebuild 3663 SHA256 b6caa9294deb3507c7348b7754189249918442a953bced569d17874ba62e7464 SHA512 940e029632d8bd9c4e8cff57fa39607479e60546250d690c5eed4fbba5b603c4f1b6ef73ea79855d7bfb3c12d7797d091aa38fb368c985b038e5ab6d6385a846 WHIRLPOOL 0be135887e0bdb0820d8f98f7c4997981548c3a3c648da8048d7be349c0aa62c572d6f0df8259164909523ef471a7e7832ab7c738990da24e2c6420c6acac9ef -MISC ChangeLog 822 SHA256 0dce65e7478dfe1d8bcaec13fdee0bc5c865a94b78deebcbfe17957ff9cad2d5 SHA512 08d16a2b9143f0dafa943785dfa2ab0c6603a3e096c9acc711e48232c3de88f03f5dbf3a35fa0cce8be87e676a50324721e16e7d5033c0bed6cd71b23d58e0eb WHIRLPOOL 6f3bb6b8ff577c7a9d1e566a52b0de2d95c370ab62304e0b52e36eaba310210263164e7124cfa8caffb33b2a0cef2f0a9eff123b7e4b73085c694a12cdde27a8 +EBUILD docker-0.6.6.ebuild 3663 SHA256 226206b737be09b63fc37446b519f36939fef2324247a5062a90bd565aef2d0c SHA512 794851abd01a565d74fb60ce03ad27094920ce2bbbb11a13420c9810f708659d575f81d98e62eea721da1dc29b6bc63d25f43c5a9f2b30dfe757b6fa71e607a3 WHIRLPOOL e53e8ca71d2c19a6fdbaceb3854d7bdfbe850e742d97c9430999fb8c43bd8a4b54bc54d74aa859d32e9994ae814e7b523bf92689459115928ed3199aa685ffa5 +MISC ChangeLog 949 SHA256 fbe00153cb86c3b6418e9dff552b16a555430d6ca495efd3b9058a69132eca5c SHA512 062f00347fbfe94f2edd57bc18b6a364bcf1ee1c9d24fc0067d739cb2ce638e36c17073618dc98097bcd453395fdeead79d44a85f41fefc177a9337fd090d3fd WHIRLPOOL 1c3261eaf1a47e8f7e262b8a08da2e4f42e928adb8484877096fcff808d8ca11d346725dabbb6cdc7c102968912a6d188ac8a03933a6e9695d286bfc4d08dd87 MISC metadata.xml 560 SHA256 8e6641818a9c28ac022101d80fce792b37a82e5066766fc26cf0ae89e610de22 SHA512 327d1e6e795869d1b675bf987b2f85551604cffeb79b861158fc9442c42fc052f95a124095d052f40bf90ef7add517df1f7c0f524062f4bfe95e0eeeed580e1b WHIRLPOOL 11fb56222b24fd992c3996975ece86b9a3e91c64782a5d36b713ac115b91f8e478d0aa62733d1421bbcf73bb519e3a8e3cfea6727472995d836b79e3beb1f843 diff --git a/app-emulation/docker/docker-0.6.6.ebuild b/app-emulation/docker/docker-0.6.6.ebuild new file mode 100644 index 000000000000..90e17cd79697 --- /dev/null +++ b/app-emulation/docker/docker-0.6.6.ebuild @@ -0,0 +1,151 @@ +# 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.6.6.ebuild,v 1.1 2013/11/11 06:19:00 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="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 "" +} |