Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/
Date: Wed, 27 Jul 2016 15:42:05
Message-Id: 1469634078.3e4b3662da5224f51ba47f39e077e8ef38ce2ddd.williamh@gentoo
1 commit: 3e4b3662da5224f51ba47f39e077e8ef38ce2ddd
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 15:41:18 2016 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 15:41:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4b3662
7
8 app-emulation/docker: 1.12.0-rc5 version bump
9
10 Package-Manager: portage-2.2.28
11
12 app-emulation/docker/Manifest | 1 +
13 app-emulation/docker/docker-1.12.0_rc5.ebuild | 270 ++++++++++++++++++++++++++
14 2 files changed, 271 insertions(+)
15
16 diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
17 index ea1a203..d3b433a 100644
18 --- a/app-emulation/docker/Manifest
19 +++ b/app-emulation/docker/Manifest
20 @@ -1,3 +1,4 @@
21 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
22 DIST docker-1.12.0_rc3.tar.gz 12359008 SHA256 3f030c4f084ed518efeb00f21f3fdfb25252dd9c153b1d42da953e59bb41c582 SHA512 438f0f6fa65f7354d3059558427aadcc86139f3c062e30407f249ba8cfcfb307f083cea1a872637dfb4c68481a11cc22580e50ca6eb51d98370665c9fdc42f65 WHIRLPOOL 30914ea9fee3759bb1229329ebc7da35d3ba39abf311abb1f90e12e45899d01954d7903579b253d3cc609ac269ceaf681e58d08e87b31232836322ab3dcc65c1
23 DIST docker-1.12.0_rc4.tar.gz 12381738 SHA256 bc256d2a348efbf236eab991254c925fa1917dd1e29cb40586f1696f4e24852e SHA512 6eee057ffad2770287143f330de9a35d5c0a94e0d4c79a7dbd14a1bdff79e61d8044ac69c7548c966c65589486424ea73f9382226d4a965f1568115da2ef21ca WHIRLPOOL f48170c199aa7639d614c443dca6aadf60178beacd675c92ee50e2216b3134a14d50e311abe9beeb30f7d10d270f68baeacfe0204de8dd1df71bc278898b034e
24 +DIST docker-1.12.0_rc5.tar.gz 12543474 SHA256 f94f52463c07256691c89eb07902999d7c79aa7c7b888ef5ee1efa2bbf1c260e SHA512 16b89b9bbd420d4fd1fe46fe674eeccb3f93281a54577efd11e8d29e215410729855b630516bef97301aab7198d45cce7426769c5f4ee06c3f95cfdd65e42457 WHIRLPOOL 39cde949419ff253cd904303d637c55abecc177058364103d4ca475c9af758797539747c782dbb171778651f59fe7d9f35ce4cba2f465bd22848286741001099
25
26 diff --git a/app-emulation/docker/docker-1.12.0_rc5.ebuild b/app-emulation/docker/docker-1.12.0_rc5.ebuild
27 new file mode 100644
28 index 0000000..5344a16
29 --- /dev/null
30 +++ b/app-emulation/docker/docker-1.12.0_rc5.ebuild
31 @@ -0,0 +1,270 @@
32 +# Copyright 1999-2016 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=6
37 +
38 +EGO_PN="github.com/docker/docker"
39 +
40 +if [[ ${PV} = *9999* ]]; then
41 + # Docker cannot be fetched via "go get", thanks to autogenerated code
42 + EGIT_REPO_URI="https://${EGO_PN}.git"
43 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
44 + inherit git-r3
45 +else
46 + MY_PV="${PV/_/-}"
47 + DOCKER_GITCOMMIT="e4a0dbc"
48 + EGIT_COMMIT="v${MY_PV}"
49 + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
50 + KEYWORDS="~amd64"
51 + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
52 + inherit golang-vcs-snapshot
53 +fi
54 +inherit bash-completion-r1 golang-base linux-info systemd udev user
55 +
56 +DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
57 +HOMEPAGE="https://dockerproject.org"
58 +LICENSE="Apache-2.0"
59 +SLOT="0"
60 +IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
61 +
62 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
63 +CDEPEND="
64 + >=dev-db/sqlite-3.7.9:3
65 + device-mapper? (
66 + >=sys-fs/lvm2-2.02.89[thin]
67 + )
68 + seccomp? ( >=sys-libs/libseccomp-2.2.1 )
69 + apparmor? ( sys-libs/libapparmor )
70 +"
71 +
72 +DEPEND="
73 + ${CDEPEND}
74 +
75 + dev-go/go-md2man
76 +
77 + btrfs? (
78 + >=sys-fs/btrfs-progs-3.8
79 + )
80 +"
81 +
82 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
83 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
84 +RDEPEND="
85 + ${CDEPEND}
86 +
87 + !app-emulation/docker-bin
88 + >=net-firewall/iptables-1.4
89 + sys-process/procps
90 + >=dev-vcs/git-1.7
91 + >=app-arch/xz-utils-4.9
92 +
93 + >app-emulation/containerd-0.2.2
94 + app-emulation/runc[apparmor?,seccomp?]
95 +"
96 +
97 +RESTRICT="installsources strip"
98 +
99 +S="${WORKDIR}/${P}/src/${EGO_PN}"
100 +
101 +# see "contrib/check-config.sh" from upstream's sources
102 +CONFIG_CHECK="
103 + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
104 + ~DEVPTS_MULTIPLE_INSTANCES
105 + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
106 + ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
107 + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
108 + ~IP_VS
109 + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
110 + ~NF_NAT ~NF_NAT_NEEDED
111 +
112 + ~POSIX_MQUEUE
113 +
114 + ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
115 +
116 + ~BLK_CGROUP ~IOSCHED_CFQ
117 + ~CGROUP_PERF
118 + ~CGROUP_HUGETLB
119 + ~NET_CLS_CGROUP
120 + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
121 + ~XFRM_ALGO ~XFRM_USER
122 +"
123 +
124 +ERROR_KEYS="CONFIG_KEYS: is mandatory"
125 +ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
126 +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
127 +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
128 +
129 +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
130 +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
131 +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
132 +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
133 +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
134 +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
135 +
136 +pkg_setup() {
137 + if kernel_is lt 3 10; then
138 + ewarn ""
139 + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
140 + ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
141 + fi
142 +
143 + # for where these kernel versions come from, see:
144 + # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
145 + if ! {
146 + kernel_is ge 3 16 \
147 + || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
148 + || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
149 + || { kernel_is 3 12 && kernel_is ge 3 12 25; }
150 + }; then
151 + ewarn ""
152 + ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
153 + ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
154 + ewarn ""
155 + ewarn "See also https://github.com/docker/docker/issues/2960"
156 + fi
157 +
158 + if kernel_is le 3 18; then
159 + CONFIG_CHECK+="
160 + ~RESOURCE_COUNTERS
161 + "
162 + fi
163 +
164 + if kernel_is le 3 13; then
165 + CONFIG_CHECK+="
166 + ~NETPRIO_CGROUP
167 + "
168 + else
169 + CONFIG_CHECK+="
170 + ~CGROUP_NET_PRIO
171 + "
172 + fi
173 +
174 + if use aufs; then
175 + CONFIG_CHECK+="
176 + ~AUFS_FS
177 + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
178 + "
179 + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
180 + fi
181 +
182 + if use btrfs; then
183 + CONFIG_CHECK+="
184 + ~BTRFS_FS
185 + "
186 + fi
187 +
188 + if use device-mapper; then
189 + CONFIG_CHECK+="
190 + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
191 + "
192 + fi
193 +
194 + if use overlay; then
195 + CONFIG_CHECK+="
196 + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
197 + "
198 + fi
199 +
200 + linux-info_pkg_setup
201 +
202 + # create docker group for the code checking for it in /etc/group
203 + enewgroup docker
204 +}
205 +
206 +src_compile() {
207 + export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
208 +
209 + # setup CFLAGS and LDFLAGS for separate build target
210 + # see https://github.com/tianon/docker-overlay/pull/10
211 + export CGO_CFLAGS="-I${ROOT}/usr/include"
212 + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
213 +
214 + # if we're building from a zip, we need the GITCOMMIT value
215 + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
216 +
217 + if gcc-specs-pie; then
218 + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
219 + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
220 +
221 + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
222 + -i hack/make/dynbinary || die
223 + grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
224 + fi
225 +
226 + # let's set up some optional features :)
227 + export DOCKER_BUILDTAGS=''
228 + for gd in aufs btrfs device-mapper overlay; do
229 + if ! use $gd; then
230 + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
231 + fi
232 + done
233 +
234 + for tag in apparmor seccomp; do
235 + if use $tag; then
236 + DOCKER_BUILDTAGS+=" $tag"
237 + fi
238 + done
239 +
240 + # https://github.com/docker/docker/pull/13338
241 + if use experimental; then
242 + export DOCKER_EXPERIMENTAL=1
243 + else
244 + unset DOCKER_EXPERIMENTAL
245 + fi
246 +
247 + # time to build!
248 + ./hack/make.sh dynbinary || die 'dynbinary failed'
249 +
250 + # build the man pages too
251 + ./man/md2man-all.sh || die "unable to generate man pages"
252 +}
253 +
254 +src_install() {
255 + VERSION="$(cat VERSION)"
256 + newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
257 + newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
258 + newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
259 + dosym containerd /usr/bin/docker-containerd
260 + dosym containerd-shim /usr/bin/docker-containerd-shim
261 + dosym runc /usr/bin/docker-runc
262 +
263 + newinitd contrib/init/openrc/docker.initd docker
264 + newconfd contrib/init/openrc/docker.confd docker
265 +
266 + systemd_dounit contrib/init/systemd/docker.{service,socket}
267 +
268 + udev_dorules contrib/udev/*.rules
269 +
270 + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
271 + dodoc -r docs/*
272 + doman man/man*/*
273 +
274 + dobashcomp contrib/completion/bash/*
275 +
276 + insinto /usr/share/zsh/site-functions
277 + doins contrib/completion/zsh/*
278 +
279 + insinto /usr/share/vim/vimfiles
280 + doins -r contrib/syntax/vim/ftdetect
281 + doins -r contrib/syntax/vim/syntax
282 +
283 + # note: intentionally not using "doins" so that we preserve +x bits
284 + mkdir -p "${D}/usr/share/${PN}/contrib"
285 + cp -R contrib/* "${D}/usr/share/${PN}/contrib"
286 +}
287 +
288 +pkg_postinst() {
289 + udev_reload
290 +
291 + elog
292 + elog "To use Docker, the Docker daemon must be running as root. To automatically"
293 + elog "start the Docker daemon at boot, add Docker to the default runlevel:"
294 + elog " rc-update add docker default"
295 + elog "Similarly for systemd:"
296 + elog " systemctl enable docker.service"
297 + elog
298 + elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
299 + elog " usermod -aG docker youruser"
300 + elog
301 +}