diff options
| -rw-r--r-- | app-emulation/docker/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/docker/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/docker/docker-0.7.5.ebuild | 184 |
3 files changed, 193 insertions, 2 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index a00f14e97709..b861706f83fd 100644 --- a/app-emulation/docker/ChangeLog +++ b/app-emulation/docker/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.11 2014/01/10 03:38:19 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.12 2014/01/10 03:39:29 gregkh Exp $ + +*docker-0.7.5 (10 Jan 2014) + + 10 Jan 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.7.5.ebuild: + 0.7.5 bump *docker-0.7.4 (10 Jan 2014) diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 4877eb88c687..be2a32118ce0 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -5,6 +5,7 @@ DIST docker-0.7.1.zip 2622521 SHA256 e54eb97726dc6cf16171e60f955f45d214d325b1cd3 DIST docker-0.7.2.zip 2621055 SHA256 34e8e324768fb67c48b308fbed22fcb6f016d4ca1fec6a127e1d14c0a3beaa07 SHA512 86835ae0e15cb09d9f878b622610e42c80fd6d61808738ed8e77c46315e7d6f6ee5fb81adff72929bccb10adf46c34f10876b78f20e658d2473b0187c9b10827 WHIRLPOOL e75776644348620eac3e8e5110c11a4e077a6df22924f29f0ca407a46308175dadb50f7ff46c0127b8be38389e58563ca735018a80376d61c20137c9bd18facc DIST docker-0.7.3.zip 2659554 SHA256 216a469acd2f11d1c0bf1a2ca07272e6f4614970bb4b0c3b32ecc691474e741b SHA512 43aeffd8d876b09721a6772a8a37b09e74661bd76b183c3ee17ef684185da1d1c83a320df3283ca53b96c77383ba5f59802835928d67df5629224f9263cf2b66 WHIRLPOOL 315e2d7b3e2dfb53d853d9b9da52b579062b70ed791d2f54dc9a4840118ea52590c6e2da12a2012b355786a70f390dfcf606f056555947e3ea93dbd11ca7b522 DIST docker-0.7.4.zip 2667244 SHA256 e087473ca83e0c7ce435333a4faacc53626cb64476818c5f9582d2ee54e67477 SHA512 d83acd96d4013c70f49bdd5206268a641fab75d558f5be10fd6eccf2f27797f66870b207edc3a1fb9dbe11a89eed8b4463f98ba87e31f0e638ac86b5685ce93e WHIRLPOOL 332a47ee73e2ad4ff8b0ebac5f63d08f594d56efdd1c77846883308b2188af5da775a7ed5786e1669803e7f509703a4a86e879cb7176fc27f0a03df324ceb94c +DIST docker-0.7.5.zip 2668999 SHA256 845ebee1f2f15fe076d5058f137a994d2054f315c4dbd1220df9a58a78075fb7 SHA512 01c4f8f8b9e0290e8834b00c4327ee959c54337a1b130074902aef23556495ae0abcfb88b1b7ca4ed76236b301779b992fb93a264bae3b5d6acd9f08c7257dd5 WHIRLPOOL 178588c3f98c89702bfa847b72efe2f27ba6eaebeb1fdfef2c831b24277d172d133dbe1f4b210e1051383c0a4fd30cd52139c03e9756c091d104f1eb5e1d6974 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 @@ -16,5 +17,6 @@ EBUILD docker-0.7.1.ebuild 4549 SHA256 3007b1f620f4c7d5c649d05792fc5bb07ac7ebec1 EBUILD docker-0.7.2.ebuild 4547 SHA256 53a78d9cea30a5610ca6594938c2740569b4659f004ce0057ad1ce509082dc49 SHA512 82a6c6521afb765826e049de8adc3063b07720fc427432fd42e8d5b21ddfaea3b562992e50756a1a348fc0b6346e27fbc61fd8cbce9622f127e52ea619adf148 WHIRLPOOL 9a2a83f451d457ef383b403a2157312667e8f152f9d5602eeff34d32cb3884576c156017c89a7391561572e35cf692d902be1e4bf4f4994e61e8e80788e87c52 EBUILD docker-0.7.3.ebuild 4547 SHA256 eb3cdb091a0b97ec14cc79dd1e4a403ae69f19dcb10d85dfc901764834d92fb6 SHA512 b0a77704a60883fb78d889c4f41176e99e1ebde14a788b9b63ad8f3a1ed1de788af01ffa727515cf07f13d7d89edd953176085b7cabda3e6b6afd98babfed761 WHIRLPOOL dbc770656fce2d8ac02fa2d7d8d6c70e46c6c17e6c3014875a589c94bf9cb58554c670751ab2b861ffc6d5f40071896c3543927fd3f48fab5e3bd4db6f3ad4cf EBUILD docker-0.7.4.ebuild 4597 SHA256 2cba1bd814e79fd86ad5703da0303317e587930f7fb0e8feff2dad88eeab642b SHA512 cb833e92a1dc99c983a67ed1bbae56d704baedf2eee4ba726f32f7ddc2d065b0a6b09a86d45b00728a627641e80423c63d095dea6fdabe43d46db22b6d15da05 WHIRLPOOL 70576e9cae672b9ab9da27f73f7ddee257319fa580b2d55d99fcc986784f62aee3ea3c6161c407ab1bf94dd29ec69f5c28c6672991761645e9b078ef97a6fde3 -MISC ChangeLog 1971 SHA256 af423dd11289d21b12315179fdbbfb2c98bceeb29416ae1ca9b0f07cbb46223b SHA512 796a557516a8b08e48c2b72d442f71b76f21985c3048357266398862eb2d1eb4118b2999d3010d466516758022133995f1e637bfd0c2b8b080eccafcf1780801 WHIRLPOOL 0f660499a880e2f81e7d7d1e459912464b1824a7dab102d2dd084c7a1e5cc56d21f97afecec1e833d59a04720721e1e4ed430a7fd747bd69105435feb1a6c2cc +EBUILD docker-0.7.5.ebuild 4597 SHA256 57b1d2dd076c4a7528cd53b9b00b7349b8f13ccad999a8087a9bd3b830378413 SHA512 77ab7d1c696d51a0e04ed7673d8bf9b3816b4896f547ad10404f8be06271b886d4a9e4747025f3dbad50881024e6aca7bb714c7158cc159bdb0f8ff2aca8d96e WHIRLPOOL ecaf0b592b21f96010c3183f2b44b23cc4240d863651e832f4c6a6c35aee5ba829e3cfa22b6d044f614771d7b5ef9fbc027050f9ef2024e7d98372402aaa0efd +MISC ChangeLog 2090 SHA256 10670c088e6995484b4ddc245081fa3080d315346a8c1630f682339ca9ab1a41 SHA512 750b7a2621e44778c6a434eba6fa200fd6d66aed9738f61534d110dd1ca508454858ffd36d4b18ec5297e8212ce1ddfdaa90e76d025e9380f836f1f7e9bce4b9 WHIRLPOOL 6b79fb8cc6b78f0d204dea6e6b146e94b9d22a44eb07ad5d3c20e2f4f684809911f469758e9359d2dc472698346d420460b062c9f5a862b197c6d292cf647b58 MISC metadata.xml 871 SHA256 9d4a2d11a771f4a4aac5bde9b3595033a5f696ad9ff33fb612809bcbcced1ce4 SHA512 dc95bbc592e49b851a5c51d65d0d51af767d813e3f30f5a67538c68742691ea40970ad68629c319eb9ccc555558a80264fd6899c0f394f1a5c134ee14709327a WHIRLPOOL 78f27bf6919dd2dd7886db2d8ca8cc9192e0ddc2940ffc2eb633528a2bea4909a814e0abec79757f180cbd30c2e3bd6fb38d6e5b278646ba378d136aff3bf352 diff --git a/app-emulation/docker/docker-0.7.5.ebuild b/app-emulation/docker/docker-0.7.5.ebuild new file mode 100644 index 000000000000..b29138756b21 --- /dev/null +++ b/app-emulation/docker/docker-0.7.5.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.7.5.ebuild,v 1.1 2014/01/10 03:39:29 gregkh Exp $ + +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 contrib/init/systemd/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 "" +} |