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 22:17:53
Message-Id: 1469657836.783fc2bd3e66800898795542476766faf8e04165.williamh@gentoo
1 commit: 783fc2bd3e66800898795542476766faf8e04165
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 22:17:16 2016 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 22:17:16 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783fc2bd
7
8 app-emulation/docker: remove older 1.12.0 release candidates
9
10 Package-Manager: portage-2.2.28
11
12 app-emulation/docker/Manifest | 2 -
13 app-emulation/docker/docker-1.12.0_rc3.ebuild | 269 ----------------------
14 app-emulation/docker/docker-1.12.0_rc4-r1.ebuild | 270 -----------------------
15 app-emulation/docker/docker-1.12.0_rc4.ebuild | 269 ----------------------
16 4 files changed, 810 deletions(-)
17
18 diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
19 index d3b433a..d529d89 100644
20 --- a/app-emulation/docker/Manifest
21 +++ b/app-emulation/docker/Manifest
22 @@ -1,4 +1,2 @@
23 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
24 -DIST docker-1.12.0_rc3.tar.gz 12359008 SHA256 3f030c4f084ed518efeb00f21f3fdfb25252dd9c153b1d42da953e59bb41c582 SHA512 438f0f6fa65f7354d3059558427aadcc86139f3c062e30407f249ba8cfcfb307f083cea1a872637dfb4c68481a11cc22580e50ca6eb51d98370665c9fdc42f65 WHIRLPOOL 30914ea9fee3759bb1229329ebc7da35d3ba39abf311abb1f90e12e45899d01954d7903579b253d3cc609ac269ceaf681e58d08e87b31232836322ab3dcc65c1
25 -DIST docker-1.12.0_rc4.tar.gz 12381738 SHA256 bc256d2a348efbf236eab991254c925fa1917dd1e29cb40586f1696f4e24852e SHA512 6eee057ffad2770287143f330de9a35d5c0a94e0d4c79a7dbd14a1bdff79e61d8044ac69c7548c966c65589486424ea73f9382226d4a965f1568115da2ef21ca WHIRLPOOL f48170c199aa7639d614c443dca6aadf60178beacd675c92ee50e2216b3134a14d50e311abe9beeb30f7d10d270f68baeacfe0204de8dd1df71bc278898b034e
26 DIST docker-1.12.0_rc5.tar.gz 12543474 SHA256 f94f52463c07256691c89eb07902999d7c79aa7c7b888ef5ee1efa2bbf1c260e SHA512 16b89b9bbd420d4fd1fe46fe674eeccb3f93281a54577efd11e8d29e215410729855b630516bef97301aab7198d45cce7426769c5f4ee06c3f95cfdd65e42457 WHIRLPOOL 39cde949419ff253cd904303d637c55abecc177058364103d4ca475c9af758797539747c782dbb171778651f59fe7d9f35ce4cba2f465bd22848286741001099
27
28 diff --git a/app-emulation/docker/docker-1.12.0_rc3.ebuild b/app-emulation/docker/docker-1.12.0_rc3.ebuild
29 deleted file mode 100644
30 index 403357d..0000000
31 --- a/app-emulation/docker/docker-1.12.0_rc3.ebuild
32 +++ /dev/null
33 @@ -1,269 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=6
39 -
40 -EGO_PN="github.com/docker/docker"
41 -
42 -if [[ ${PV} = *9999* ]]; then
43 - # Docker cannot be fetched via "go get", thanks to autogenerated code
44 - EGIT_REPO_URI="https://${EGO_PN}.git"
45 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
46 - inherit git-r3
47 -else
48 - MY_PV="${PV/_/-}"
49 - DOCKER_GITCOMMIT="91e29e8"
50 - EGIT_COMMIT="v${MY_PV}"
51 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
52 - KEYWORDS="~amd64"
53 - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
54 - inherit golang-vcs-snapshot
55 -fi
56 -inherit bash-completion-r1 golang-base linux-info systemd udev user
57 -
58 -DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
59 -HOMEPAGE="https://dockerproject.org"
60 -LICENSE="Apache-2.0"
61 -SLOT="0"
62 -IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
63 -
64 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
65 -CDEPEND="
66 - >=dev-db/sqlite-3.7.9:3
67 - device-mapper? (
68 - >=sys-fs/lvm2-2.02.89[thin]
69 - )
70 - seccomp? ( >=sys-libs/libseccomp-2.2.1 )
71 - apparmor? ( sys-libs/libapparmor )
72 -"
73 -
74 -DEPEND="
75 - ${CDEPEND}
76 -
77 - dev-go/go-md2man
78 -
79 - btrfs? (
80 - >=sys-fs/btrfs-progs-3.8
81 - )
82 -"
83 -
84 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
85 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
86 -RDEPEND="
87 - ${CDEPEND}
88 -
89 - !app-emulation/docker-bin
90 - >=net-firewall/iptables-1.4
91 - sys-process/procps
92 - >=dev-vcs/git-1.7
93 - >=app-arch/xz-utils-4.9
94 -
95 - >app-emulation/containerd-0.2.2
96 - app-emulation/runc[apparmor?,seccomp?]
97 -"
98 -
99 -RESTRICT="installsources strip"
100 -
101 -S="${WORKDIR}/${P}/src/${EGO_PN}"
102 -
103 -# see "contrib/check-config.sh" from upstream's sources
104 -CONFIG_CHECK="
105 - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
106 - ~DEVPTS_MULTIPLE_INSTANCES
107 - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
108 - ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
109 - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
110 - ~IP_VS
111 - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
112 - ~NF_NAT ~NF_NAT_NEEDED
113 -
114 - ~POSIX_MQUEUE
115 -
116 - ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
117 -
118 - ~BLK_CGROUP ~IOSCHED_CFQ
119 - ~CGROUP_PERF
120 - ~CGROUP_HUGETLB
121 - ~NET_CLS_CGROUP
122 - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
123 - ~XFRM_ALGO ~XFRM_USER
124 -"
125 -
126 -ERROR_KEYS="CONFIG_KEYS: is mandatory"
127 -ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
128 -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
129 -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
130 -
131 -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
132 -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
133 -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
134 -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
135 -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
136 -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
137 -
138 -pkg_setup() {
139 - if kernel_is lt 3 10; then
140 - ewarn ""
141 - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
142 - ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
143 - fi
144 -
145 - # for where these kernel versions come from, see:
146 - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
147 - if ! {
148 - kernel_is ge 3 16 \
149 - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
150 - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
151 - || { kernel_is 3 12 && kernel_is ge 3 12 25; }
152 - }; then
153 - ewarn ""
154 - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
155 - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
156 - ewarn ""
157 - ewarn "See also https://github.com/docker/docker/issues/2960"
158 - fi
159 -
160 - if kernel_is le 3 18; then
161 - CONFIG_CHECK+="
162 - ~RESOURCE_COUNTERS
163 - "
164 - fi
165 -
166 - if kernel_is le 3 13; then
167 - CONFIG_CHECK+="
168 - ~NETPRIO_CGROUP
169 - "
170 - else
171 - CONFIG_CHECK+="
172 - ~CGROUP_NET_PRIO
173 - "
174 - fi
175 -
176 - if use aufs; then
177 - CONFIG_CHECK+="
178 - ~AUFS_FS
179 - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
180 - "
181 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
182 - fi
183 -
184 - if use btrfs; then
185 - CONFIG_CHECK+="
186 - ~BTRFS_FS
187 - "
188 - fi
189 -
190 - if use device-mapper; then
191 - CONFIG_CHECK+="
192 - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
193 - "
194 - fi
195 -
196 - if use overlay; then
197 - CONFIG_CHECK+="
198 - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
199 - "
200 - fi
201 -
202 - linux-info_pkg_setup
203 -
204 - # create docker group for the code checking for it in /etc/group
205 - enewgroup docker
206 -}
207 -
208 -src_compile() {
209 - export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
210 -
211 - # setup CFLAGS and LDFLAGS for separate build target
212 - # see https://github.com/tianon/docker-overlay/pull/10
213 - export CGO_CFLAGS="-I${ROOT}/usr/include"
214 - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
215 -
216 - # if we're building from a zip, we need the GITCOMMIT value
217 - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
218 -
219 - if gcc-specs-pie; then
220 - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
221 - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
222 -
223 - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
224 - -i hack/make/dynbinary || die
225 - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
226 - fi
227 -
228 - # let's set up some optional features :)
229 - export DOCKER_BUILDTAGS=''
230 - for gd in aufs btrfs device-mapper overlay; do
231 - if ! use $gd; then
232 - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
233 - fi
234 - done
235 -
236 - for tag in apparmor seccomp; do
237 - if use $tag; then
238 - DOCKER_BUILDTAGS+=" $tag"
239 - fi
240 - done
241 -
242 - # https://github.com/docker/docker/pull/13338
243 - if use experimental; then
244 - export DOCKER_EXPERIMENTAL=1
245 - else
246 - unset DOCKER_EXPERIMENTAL
247 - fi
248 -
249 - # time to build!
250 - ./hack/make.sh dynbinary || die 'dynbinary failed'
251 -
252 - # build the man pages too
253 - ./man/md2man-all.sh || die "unable to generate man pages"
254 -}
255 -
256 -src_install() {
257 - VERSION="$(cat VERSION)"
258 - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
259 - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
260 - dosym containerd /usr/bin/docker-containerd
261 - dosym containerd-shim /usr/bin/docker-containerd-shim
262 - dosym runc /usr/bin/docker-runc
263 -
264 - newinitd contrib/init/openrc/docker.initd docker
265 - newconfd contrib/init/openrc/docker.confd docker
266 -
267 - systemd_dounit contrib/init/systemd/docker.{service,socket}
268 -
269 - udev_dorules contrib/udev/*.rules
270 -
271 - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
272 - dodoc -r docs/*
273 - doman man/man*/*
274 -
275 - dobashcomp contrib/completion/bash/*
276 -
277 - insinto /usr/share/zsh/site-functions
278 - doins contrib/completion/zsh/*
279 -
280 - insinto /usr/share/vim/vimfiles
281 - doins -r contrib/syntax/vim/ftdetect
282 - doins -r contrib/syntax/vim/syntax
283 -
284 - # note: intentionally not using "doins" so that we preserve +x bits
285 - mkdir -p "${D}/usr/share/${PN}/contrib"
286 - cp -R contrib/* "${D}/usr/share/${PN}/contrib"
287 -}
288 -
289 -pkg_postinst() {
290 - udev_reload
291 -
292 - elog
293 - elog "To use Docker, the Docker daemon must be running as root. To automatically"
294 - elog "start the Docker daemon at boot, add Docker to the default runlevel:"
295 - elog " rc-update add docker default"
296 - elog "Similarly for systemd:"
297 - elog " systemctl enable docker.service"
298 - elog
299 - elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
300 - elog " usermod -aG docker youruser"
301 - elog
302 -}
303
304 diff --git a/app-emulation/docker/docker-1.12.0_rc4-r1.ebuild b/app-emulation/docker/docker-1.12.0_rc4-r1.ebuild
305 deleted file mode 100644
306 index 5344a16..0000000
307 --- a/app-emulation/docker/docker-1.12.0_rc4-r1.ebuild
308 +++ /dev/null
309 @@ -1,270 +0,0 @@
310 -# Copyright 1999-2016 Gentoo Foundation
311 -# Distributed under the terms of the GNU General Public License v2
312 -# $Id$
313 -
314 -EAPI=6
315 -
316 -EGO_PN="github.com/docker/docker"
317 -
318 -if [[ ${PV} = *9999* ]]; then
319 - # Docker cannot be fetched via "go get", thanks to autogenerated code
320 - EGIT_REPO_URI="https://${EGO_PN}.git"
321 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
322 - inherit git-r3
323 -else
324 - MY_PV="${PV/_/-}"
325 - DOCKER_GITCOMMIT="e4a0dbc"
326 - EGIT_COMMIT="v${MY_PV}"
327 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
328 - KEYWORDS="~amd64"
329 - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
330 - inherit golang-vcs-snapshot
331 -fi
332 -inherit bash-completion-r1 golang-base linux-info systemd udev user
333 -
334 -DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
335 -HOMEPAGE="https://dockerproject.org"
336 -LICENSE="Apache-2.0"
337 -SLOT="0"
338 -IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
339 -
340 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
341 -CDEPEND="
342 - >=dev-db/sqlite-3.7.9:3
343 - device-mapper? (
344 - >=sys-fs/lvm2-2.02.89[thin]
345 - )
346 - seccomp? ( >=sys-libs/libseccomp-2.2.1 )
347 - apparmor? ( sys-libs/libapparmor )
348 -"
349 -
350 -DEPEND="
351 - ${CDEPEND}
352 -
353 - dev-go/go-md2man
354 -
355 - btrfs? (
356 - >=sys-fs/btrfs-progs-3.8
357 - )
358 -"
359 -
360 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
361 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
362 -RDEPEND="
363 - ${CDEPEND}
364 -
365 - !app-emulation/docker-bin
366 - >=net-firewall/iptables-1.4
367 - sys-process/procps
368 - >=dev-vcs/git-1.7
369 - >=app-arch/xz-utils-4.9
370 -
371 - >app-emulation/containerd-0.2.2
372 - app-emulation/runc[apparmor?,seccomp?]
373 -"
374 -
375 -RESTRICT="installsources strip"
376 -
377 -S="${WORKDIR}/${P}/src/${EGO_PN}"
378 -
379 -# see "contrib/check-config.sh" from upstream's sources
380 -CONFIG_CHECK="
381 - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
382 - ~DEVPTS_MULTIPLE_INSTANCES
383 - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
384 - ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
385 - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
386 - ~IP_VS
387 - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
388 - ~NF_NAT ~NF_NAT_NEEDED
389 -
390 - ~POSIX_MQUEUE
391 -
392 - ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
393 -
394 - ~BLK_CGROUP ~IOSCHED_CFQ
395 - ~CGROUP_PERF
396 - ~CGROUP_HUGETLB
397 - ~NET_CLS_CGROUP
398 - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
399 - ~XFRM_ALGO ~XFRM_USER
400 -"
401 -
402 -ERROR_KEYS="CONFIG_KEYS: is mandatory"
403 -ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
404 -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
405 -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
406 -
407 -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
408 -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
409 -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
410 -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
411 -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
412 -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
413 -
414 -pkg_setup() {
415 - if kernel_is lt 3 10; then
416 - ewarn ""
417 - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
418 - ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
419 - fi
420 -
421 - # for where these kernel versions come from, see:
422 - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
423 - if ! {
424 - kernel_is ge 3 16 \
425 - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
426 - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
427 - || { kernel_is 3 12 && kernel_is ge 3 12 25; }
428 - }; then
429 - ewarn ""
430 - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
431 - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
432 - ewarn ""
433 - ewarn "See also https://github.com/docker/docker/issues/2960"
434 - fi
435 -
436 - if kernel_is le 3 18; then
437 - CONFIG_CHECK+="
438 - ~RESOURCE_COUNTERS
439 - "
440 - fi
441 -
442 - if kernel_is le 3 13; then
443 - CONFIG_CHECK+="
444 - ~NETPRIO_CGROUP
445 - "
446 - else
447 - CONFIG_CHECK+="
448 - ~CGROUP_NET_PRIO
449 - "
450 - fi
451 -
452 - if use aufs; then
453 - CONFIG_CHECK+="
454 - ~AUFS_FS
455 - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
456 - "
457 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
458 - fi
459 -
460 - if use btrfs; then
461 - CONFIG_CHECK+="
462 - ~BTRFS_FS
463 - "
464 - fi
465 -
466 - if use device-mapper; then
467 - CONFIG_CHECK+="
468 - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
469 - "
470 - fi
471 -
472 - if use overlay; then
473 - CONFIG_CHECK+="
474 - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
475 - "
476 - fi
477 -
478 - linux-info_pkg_setup
479 -
480 - # create docker group for the code checking for it in /etc/group
481 - enewgroup docker
482 -}
483 -
484 -src_compile() {
485 - export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
486 -
487 - # setup CFLAGS and LDFLAGS for separate build target
488 - # see https://github.com/tianon/docker-overlay/pull/10
489 - export CGO_CFLAGS="-I${ROOT}/usr/include"
490 - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
491 -
492 - # if we're building from a zip, we need the GITCOMMIT value
493 - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
494 -
495 - if gcc-specs-pie; then
496 - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
497 - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
498 -
499 - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
500 - -i hack/make/dynbinary || die
501 - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
502 - fi
503 -
504 - # let's set up some optional features :)
505 - export DOCKER_BUILDTAGS=''
506 - for gd in aufs btrfs device-mapper overlay; do
507 - if ! use $gd; then
508 - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
509 - fi
510 - done
511 -
512 - for tag in apparmor seccomp; do
513 - if use $tag; then
514 - DOCKER_BUILDTAGS+=" $tag"
515 - fi
516 - done
517 -
518 - # https://github.com/docker/docker/pull/13338
519 - if use experimental; then
520 - export DOCKER_EXPERIMENTAL=1
521 - else
522 - unset DOCKER_EXPERIMENTAL
523 - fi
524 -
525 - # time to build!
526 - ./hack/make.sh dynbinary || die 'dynbinary failed'
527 -
528 - # build the man pages too
529 - ./man/md2man-all.sh || die "unable to generate man pages"
530 -}
531 -
532 -src_install() {
533 - VERSION="$(cat VERSION)"
534 - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
535 - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
536 - newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
537 - dosym containerd /usr/bin/docker-containerd
538 - dosym containerd-shim /usr/bin/docker-containerd-shim
539 - dosym runc /usr/bin/docker-runc
540 -
541 - newinitd contrib/init/openrc/docker.initd docker
542 - newconfd contrib/init/openrc/docker.confd docker
543 -
544 - systemd_dounit contrib/init/systemd/docker.{service,socket}
545 -
546 - udev_dorules contrib/udev/*.rules
547 -
548 - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
549 - dodoc -r docs/*
550 - doman man/man*/*
551 -
552 - dobashcomp contrib/completion/bash/*
553 -
554 - insinto /usr/share/zsh/site-functions
555 - doins contrib/completion/zsh/*
556 -
557 - insinto /usr/share/vim/vimfiles
558 - doins -r contrib/syntax/vim/ftdetect
559 - doins -r contrib/syntax/vim/syntax
560 -
561 - # note: intentionally not using "doins" so that we preserve +x bits
562 - mkdir -p "${D}/usr/share/${PN}/contrib"
563 - cp -R contrib/* "${D}/usr/share/${PN}/contrib"
564 -}
565 -
566 -pkg_postinst() {
567 - udev_reload
568 -
569 - elog
570 - elog "To use Docker, the Docker daemon must be running as root. To automatically"
571 - elog "start the Docker daemon at boot, add Docker to the default runlevel:"
572 - elog " rc-update add docker default"
573 - elog "Similarly for systemd:"
574 - elog " systemctl enable docker.service"
575 - elog
576 - elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
577 - elog " usermod -aG docker youruser"
578 - elog
579 -}
580
581 diff --git a/app-emulation/docker/docker-1.12.0_rc4.ebuild b/app-emulation/docker/docker-1.12.0_rc4.ebuild
582 deleted file mode 100644
583 index 059bc39..0000000
584 --- a/app-emulation/docker/docker-1.12.0_rc4.ebuild
585 +++ /dev/null
586 @@ -1,269 +0,0 @@
587 -# Copyright 1999-2016 Gentoo Foundation
588 -# Distributed under the terms of the GNU General Public License v2
589 -# $Id$
590 -
591 -EAPI=6
592 -
593 -EGO_PN="github.com/docker/docker"
594 -
595 -if [[ ${PV} = *9999* ]]; then
596 - # Docker cannot be fetched via "go get", thanks to autogenerated code
597 - EGIT_REPO_URI="https://${EGO_PN}.git"
598 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
599 - inherit git-r3
600 -else
601 - MY_PV="${PV/_/-}"
602 - DOCKER_GITCOMMIT="e4a0dbc"
603 - EGIT_COMMIT="v${MY_PV}"
604 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
605 - KEYWORDS="~amd64"
606 - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
607 - inherit golang-vcs-snapshot
608 -fi
609 -inherit bash-completion-r1 golang-base linux-info systemd udev user
610 -
611 -DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
612 -HOMEPAGE="https://dockerproject.org"
613 -LICENSE="Apache-2.0"
614 -SLOT="0"
615 -IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
616 -
617 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
618 -CDEPEND="
619 - >=dev-db/sqlite-3.7.9:3
620 - device-mapper? (
621 - >=sys-fs/lvm2-2.02.89[thin]
622 - )
623 - seccomp? ( >=sys-libs/libseccomp-2.2.1 )
624 - apparmor? ( sys-libs/libapparmor )
625 -"
626 -
627 -DEPEND="
628 - ${CDEPEND}
629 -
630 - dev-go/go-md2man
631 -
632 - btrfs? (
633 - >=sys-fs/btrfs-progs-3.8
634 - )
635 -"
636 -
637 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
638 -# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
639 -RDEPEND="
640 - ${CDEPEND}
641 -
642 - !app-emulation/docker-bin
643 - >=net-firewall/iptables-1.4
644 - sys-process/procps
645 - >=dev-vcs/git-1.7
646 - >=app-arch/xz-utils-4.9
647 -
648 - >app-emulation/containerd-0.2.2
649 - app-emulation/runc[apparmor?,seccomp?]
650 -"
651 -
652 -RESTRICT="installsources strip"
653 -
654 -S="${WORKDIR}/${P}/src/${EGO_PN}"
655 -
656 -# see "contrib/check-config.sh" from upstream's sources
657 -CONFIG_CHECK="
658 - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
659 - ~DEVPTS_MULTIPLE_INSTANCES
660 - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
661 - ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
662 - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
663 - ~IP_VS
664 - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
665 - ~NF_NAT ~NF_NAT_NEEDED
666 -
667 - ~POSIX_MQUEUE
668 -
669 - ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
670 -
671 - ~BLK_CGROUP ~IOSCHED_CFQ
672 - ~CGROUP_PERF
673 - ~CGROUP_HUGETLB
674 - ~NET_CLS_CGROUP
675 - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
676 - ~XFRM_ALGO ~XFRM_USER
677 -"
678 -
679 -ERROR_KEYS="CONFIG_KEYS: is mandatory"
680 -ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
681 -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
682 -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
683 -
684 -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
685 -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
686 -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
687 -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
688 -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
689 -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
690 -
691 -pkg_setup() {
692 - if kernel_is lt 3 10; then
693 - ewarn ""
694 - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
695 - ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
696 - fi
697 -
698 - # for where these kernel versions come from, see:
699 - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
700 - if ! {
701 - kernel_is ge 3 16 \
702 - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
703 - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
704 - || { kernel_is 3 12 && kernel_is ge 3 12 25; }
705 - }; then
706 - ewarn ""
707 - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
708 - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
709 - ewarn ""
710 - ewarn "See also https://github.com/docker/docker/issues/2960"
711 - fi
712 -
713 - if kernel_is le 3 18; then
714 - CONFIG_CHECK+="
715 - ~RESOURCE_COUNTERS
716 - "
717 - fi
718 -
719 - if kernel_is le 3 13; then
720 - CONFIG_CHECK+="
721 - ~NETPRIO_CGROUP
722 - "
723 - else
724 - CONFIG_CHECK+="
725 - ~CGROUP_NET_PRIO
726 - "
727 - fi
728 -
729 - if use aufs; then
730 - CONFIG_CHECK+="
731 - ~AUFS_FS
732 - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
733 - "
734 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
735 - fi
736 -
737 - if use btrfs; then
738 - CONFIG_CHECK+="
739 - ~BTRFS_FS
740 - "
741 - fi
742 -
743 - if use device-mapper; then
744 - CONFIG_CHECK+="
745 - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
746 - "
747 - fi
748 -
749 - if use overlay; then
750 - CONFIG_CHECK+="
751 - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
752 - "
753 - fi
754 -
755 - linux-info_pkg_setup
756 -
757 - # create docker group for the code checking for it in /etc/group
758 - enewgroup docker
759 -}
760 -
761 -src_compile() {
762 - export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
763 -
764 - # setup CFLAGS and LDFLAGS for separate build target
765 - # see https://github.com/tianon/docker-overlay/pull/10
766 - export CGO_CFLAGS="-I${ROOT}/usr/include"
767 - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
768 -
769 - # if we're building from a zip, we need the GITCOMMIT value
770 - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
771 -
772 - if gcc-specs-pie; then
773 - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
774 - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
775 -
776 - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
777 - -i hack/make/dynbinary || die
778 - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
779 - fi
780 -
781 - # let's set up some optional features :)
782 - export DOCKER_BUILDTAGS=''
783 - for gd in aufs btrfs device-mapper overlay; do
784 - if ! use $gd; then
785 - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
786 - fi
787 - done
788 -
789 - for tag in apparmor seccomp; do
790 - if use $tag; then
791 - DOCKER_BUILDTAGS+=" $tag"
792 - fi
793 - done
794 -
795 - # https://github.com/docker/docker/pull/13338
796 - if use experimental; then
797 - export DOCKER_EXPERIMENTAL=1
798 - else
799 - unset DOCKER_EXPERIMENTAL
800 - fi
801 -
802 - # time to build!
803 - ./hack/make.sh dynbinary || die 'dynbinary failed'
804 -
805 - # build the man pages too
806 - ./man/md2man-all.sh || die "unable to generate man pages"
807 -}
808 -
809 -src_install() {
810 - VERSION="$(cat VERSION)"
811 - newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
812 - newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
813 - dosym containerd /usr/bin/docker-containerd
814 - dosym containerd-shim /usr/bin/docker-containerd-shim
815 - dosym runc /usr/bin/docker-runc
816 -
817 - newinitd contrib/init/openrc/docker.initd docker
818 - newconfd contrib/init/openrc/docker.confd docker
819 -
820 - systemd_dounit contrib/init/systemd/docker.{service,socket}
821 -
822 - udev_dorules contrib/udev/*.rules
823 -
824 - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
825 - dodoc -r docs/*
826 - doman man/man*/*
827 -
828 - dobashcomp contrib/completion/bash/*
829 -
830 - insinto /usr/share/zsh/site-functions
831 - doins contrib/completion/zsh/*
832 -
833 - insinto /usr/share/vim/vimfiles
834 - doins -r contrib/syntax/vim/ftdetect
835 - doins -r contrib/syntax/vim/syntax
836 -
837 - # note: intentionally not using "doins" so that we preserve +x bits
838 - mkdir -p "${D}/usr/share/${PN}/contrib"
839 - cp -R contrib/* "${D}/usr/share/${PN}/contrib"
840 -}
841 -
842 -pkg_postinst() {
843 - udev_reload
844 -
845 - elog
846 - elog "To use Docker, the Docker daemon must be running as root. To automatically"
847 - elog "start the Docker daemon at boot, add Docker to the default runlevel:"
848 - elog " rc-update add docker default"
849 - elog "Similarly for systemd:"
850 - elog " systemctl enable docker.service"
851 - elog
852 - elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
853 - elog " usermod -aG docker youruser"
854 - elog
855 -}