From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB3DD1395E1 for ; Mon, 31 Oct 2016 22:23:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA52DE0B6D; Mon, 31 Oct 2016 22:23:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75A2EE0B6D for ; Mon, 31 Oct 2016 22:23:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0F8E341024 for ; Mon, 31 Oct 2016 22:23:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04ACA2EE for ; Mon, 31 Oct 2016 22:23:07 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1477952560.d2c4ee5ee69b69c38c55df1f9ccdfac7dab06b9f.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/Manifest app-emulation/docker/docker-1.12.3.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d2c4ee5ee69b69c38c55df1f9ccdfac7dab06b9f X-VCS-Branch: master Date: Mon, 31 Oct 2016 22:23:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bf708a42-6a92-4cb0-9a32-98a25e34f5ce X-Archives-Hash: 897433d465863c321187c39a8e1a6548 commit: d2c4ee5ee69b69c38c55df1f9ccdfac7dab06b9f Author: William Hubbs gentoo org> AuthorDate: Mon Oct 31 22:20:27 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Oct 31 22:22:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c4ee5e app-emulation/docker: 1.12.3 version bump Package-Manager: portage-2.3.0 app-emulation/docker/Manifest | 1 + app-emulation/docker/docker-1.12.3.ebuild | 292 ++++++++++++++++++++++++++++++ 2 files changed, 293 insertions(+) diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 82d899d..4fca8a0 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -2,3 +2,4 @@ DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e813 DIST docker-1.12.0.tar.gz 13018773 SHA256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 SHA512 113707c0447bc096dc59204a1666b9f3a4e92d0ad89f016a0259734d6eee47861d5a6b1febab61f357212f0b4ffceea7ed3a53f883a748604aeb65bb5701413b WHIRLPOOL aa817e74c00b3f4ec9f494336a8a2f46d41ff978a4d04f4400a3f6ba21b4271a8f80b3708c4e18f9517f974f8e4f59194edbd57e3a662910cb01483fa6332b48 DIST docker-1.12.1.tar.gz 13135631 SHA256 0c71255fc69ffec377800468e2b1c97681f150f3719ffa09829a17b717ff4e01 SHA512 8917e23d2826f45951710dcc47625c272405466661b7fa6b75fb7e143fdcc5c78cbf6a7475663b96b22126ba3c2dab3b3a8c11ca396dc8408d1aa9f2667c95e7 WHIRLPOOL 915707b6563f10670678b064031173e58a2aa9e380fbd95f0a11951ece3f7d53fbb5a62241a611bafb66edc116cfd9de62d144d62abcb4e2cd43e125863ab0b9 DIST docker-1.12.2.tar.gz 13680145 SHA256 29bc203e483c81c9a337b4a4186e6b0a23984c518b09478d8718c616b5923e88 SHA512 ef8dc9ee4817bad757f5e3396a7062076415305fe5e3ea3a8e04b3d4690119d27e81429d34450de7119c3039231b1e501806962cd529bb10d33c0884a9c05729 WHIRLPOOL f313383842f2e0e9ca7805c239da84283de9ac5c8778a501bb76f4be6b166b07394112b0fea88e52baa3e17094dbc569ccc2ac9b4ed493873e4210893e8115cc +DIST docker-1.12.3.tar.gz 13678274 SHA256 cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 SHA512 8577bcfe892d1fae6ca4edcd72c1a1c0a223ea3e322f3b63674dcb4833605c2dd2365cf376e4e08c0a900db50a927aaa0518ceb25f9542fe30c52a28903b0201 WHIRLPOOL 853f0a55836d4a34010f87399e875b9402703f1fb665e760255b198da6a68417c50b162cffe65e2c704e076be0520e3ecdb1418749cd3ddf63f426851bc0fbde diff --git a/app-emulation/docker/docker-1.12.3.ebuild b/app-emulation/docker/docker-1.12.3.ebuild new file mode 100644 index 00000000..1973a22 --- /dev/null +++ b/app-emulation/docker/docker-1.12.3.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGO_PN="github.com/docker/docker" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + MY_PV="${PV/_/-}" + DOCKER_GITCOMMIT="6b644ec" + EGIT_COMMIT="v${MY_PV}" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev user + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://dockerproject.org" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp" + +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + >=sys-fs/lvm2-2.02.89[thin] + ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) +" + +DEPEND=" + ${CDEPEND} + + dev-go/go-md2man + + btrfs? ( + >=sys-fs/btrfs-progs-3.8 + ) +" + +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${CDEPEND} + + !app-emulation/docker-bin + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + + >app-emulation/containerd-0.2.2 + app-emulation/runc[apparmor?,seccomp?] +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK + ~NF_NAT ~NF_NAT_NEEDED + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + + ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS + + ~VXLAN + ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" + fi + + # for where these kernel versions come from, see: + # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* + if ! { + kernel_is ge 3 16 \ + || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ + || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ + || { kernel_is 3 12 && kernel_is ge 3 12 25; } + }; then + ewarn "" + ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" + ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" + ewarn "" + ewarn "See also https://github.com/docker/docker/issues/2960" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + + linux-info_pkg_setup + + # create docker group for the code checking for it in /etc/group + enewgroup docker +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}:${PWD}/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/$(get_libdir)" + + # 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/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-client || die + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' + fi + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + # https://github.com/docker/docker/pull/13338 + if use experimental; then + export DOCKER_EXPERIMENTAL=1 + else + unset DOCKER_EXPERIMENTAL + fi + + # time to build! + ./hack/make.sh dynbinary || die 'dynbinary failed' + + # build the man pages too + ./man/md2man-all.sh || die "unable to generate man pages" +} + +src_install() { + VERSION="$(cat VERSION)" + newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker + newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd + newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + doman man/man*/* + + dobashcomp contrib/completion/bash/* + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + mkdir -p "${D}/usr/share/${PN}/contrib" + cp -R contrib/* "${D}/usr/share/${PN}/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 + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog " usermod -aG docker youruser" + elog +}