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: Fri, 29 Jul 2016 16:28:02
Message-Id: 1469809657.3fb5f3f2eaaf48611cf7c6321009378d056a55e0.williamh@gentoo
1 commit: 3fb5f3f2eaaf48611cf7c6321009378d056a55e0
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 29 16:25:27 2016 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 29 16:27:37 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb5f3f2
7
8 app-emulation/docker: 1.12.0 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.ebuild | 281 ++++++++++++++++++++++++++++++
14 2 files changed, 282 insertions(+)
15
16 diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
17 index d529d89..eac7edd 100644
18 --- a/app-emulation/docker/Manifest
19 +++ b/app-emulation/docker/Manifest
20 @@ -1,2 +1,3 @@
21 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
22 +DIST docker-1.12.0.tar.gz 13018773 SHA256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 SHA512 113707c0447bc096dc59204a1666b9f3a4e92d0ad89f016a0259734d6eee47861d5a6b1febab61f357212f0b4ffceea7ed3a53f883a748604aeb65bb5701413b WHIRLPOOL aa817e74c00b3f4ec9f494336a8a2f46d41ff978a4d04f4400a3f6ba21b4271a8f80b3708c4e18f9517f974f8e4f59194edbd57e3a662910cb01483fa6332b48
23 DIST docker-1.12.0_rc5.tar.gz 12543474 SHA256 f94f52463c07256691c89eb07902999d7c79aa7c7b888ef5ee1efa2bbf1c260e SHA512 16b89b9bbd420d4fd1fe46fe674eeccb3f93281a54577efd11e8d29e215410729855b630516bef97301aab7198d45cce7426769c5f4ee06c3f95cfdd65e42457 WHIRLPOOL 39cde949419ff253cd904303d637c55abecc177058364103d4ca475c9af758797539747c782dbb171778651f59fe7d9f35ce4cba2f465bd22848286741001099
24
25 diff --git a/app-emulation/docker/docker-1.12.0.ebuild b/app-emulation/docker/docker-1.12.0.ebuild
26 new file mode 100644
27 index 0000000..1b1ed87
28 --- /dev/null
29 +++ b/app-emulation/docker/docker-1.12.0.ebuild
30 @@ -0,0 +1,281 @@
31 +# Copyright 1999-2016 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Id$
34 +
35 +EAPI=6
36 +
37 +EGO_PN="github.com/docker/docker"
38 +
39 +if [[ ${PV} = *9999* ]]; then
40 + # Docker cannot be fetched via "go get", thanks to autogenerated code
41 + EGIT_REPO_URI="https://${EGO_PN}.git"
42 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
43 + inherit git-r3
44 +else
45 + MY_PV="${PV/_/-}"
46 + DOCKER_GITCOMMIT="8eab29e"
47 + EGIT_COMMIT="v${MY_PV}"
48 + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
49 + KEYWORDS="~amd64"
50 + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
51 + inherit golang-vcs-snapshot
52 +fi
53 +inherit bash-completion-r1 golang-base linux-info systemd udev user
54 +
55 +DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
56 +HOMEPAGE="https://dockerproject.org"
57 +LICENSE="Apache-2.0"
58 +SLOT="0"
59 +IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
60 +
61 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
62 +CDEPEND="
63 + >=dev-db/sqlite-3.7.9:3
64 + device-mapper? (
65 + >=sys-fs/lvm2-2.02.89[thin]
66 + )
67 + seccomp? ( >=sys-libs/libseccomp-2.2.1 )
68 + apparmor? ( sys-libs/libapparmor )
69 +"
70 +
71 +DEPEND="
72 + ${CDEPEND}
73 +
74 + dev-go/go-md2man
75 +
76 + btrfs? (
77 + >=sys-fs/btrfs-progs-3.8
78 + )
79 +"
80 +
81 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
82 +# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
83 +RDEPEND="
84 + ${CDEPEND}
85 +
86 + !app-emulation/docker-bin
87 + >=net-firewall/iptables-1.4
88 + sys-process/procps
89 + >=dev-vcs/git-1.7
90 + >=app-arch/xz-utils-4.9
91 +
92 + >app-emulation/containerd-0.2.2
93 + app-emulation/runc[apparmor?,seccomp?]
94 +"
95 +
96 +RESTRICT="installsources strip"
97 +
98 +S="${WORKDIR}/${P}/src/${EGO_PN}"
99 +
100 +# see "contrib/check-config.sh" from upstream's sources
101 +CONFIG_CHECK="
102 + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
103 + ~DEVPTS_MULTIPLE_INSTANCES
104 + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
105 + ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
106 + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE
107 + ~IP_VS ~IP_VS_RR
108 + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
109 + ~NETFILTER_XT_MATCH_IVPS
110 + ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT
111 + ~NF_NAT ~NF_NAT_NEEDED
112 +
113 + ~POSIX_MQUEUE
114 +
115 + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
116 +
117 + ~BLK_CGROUP ~IOSCHED_CFQ
118 + ~CGROUP_PERF
119 + ~CGROUP_HUGETLB
120 + ~NET_CLS_CGROUP
121 + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
122 + ~XFRM_ALGO ~XFRM_USER
123 +"
124 +
125 +ERROR_KEYS="CONFIG_KEYS: is mandatory"
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 kernel_is lt 4 5; then
175 + CONFIG_CHECK+="
176 + ~MEMCG_KMEM
177 + "
178 + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
179 + fi
180 +
181 + if use aufs; then
182 + CONFIG_CHECK+="
183 + ~AUFS_FS
184 + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
185 + "
186 + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
187 + fi
188 +
189 + if use btrfs; then
190 + CONFIG_CHECK+="
191 + ~BTRFS_FS
192 + "
193 + fi
194 +
195 + if use device-mapper; then
196 + CONFIG_CHECK+="
197 + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
198 + "
199 + fi
200 +
201 + if use overlay; then
202 + CONFIG_CHECK+="
203 + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
204 + "
205 + fi
206 +
207 + linux-info_pkg_setup
208 +
209 + # create docker group for the code checking for it in /etc/group
210 + enewgroup docker
211 +}
212 +
213 +src_compile() {
214 + export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
215 +
216 + # setup CFLAGS and LDFLAGS for separate build target
217 + # see https://github.com/tianon/docker-overlay/pull/10
218 + export CGO_CFLAGS="-I${ROOT}/usr/include"
219 + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
220 +
221 + # if we're building from a zip, we need the GITCOMMIT value
222 + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
223 +
224 + if gcc-specs-pie; then
225 + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
226 + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
227 +
228 + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
229 + -i hack/make/dynbinary-client || die
230 + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
231 + -i hack/make/dynbinary-daemon || die
232 + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
233 + grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
234 + fi
235 +
236 + # let's set up some optional features :)
237 + export DOCKER_BUILDTAGS=''
238 + for gd in aufs btrfs device-mapper overlay; do
239 + if ! use $gd; then
240 + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
241 + fi
242 + done
243 +
244 + for tag in apparmor seccomp; do
245 + if use $tag; then
246 + DOCKER_BUILDTAGS+=" $tag"
247 + fi
248 + done
249 +
250 + # https://github.com/docker/docker/pull/13338
251 + if use experimental; then
252 + export DOCKER_EXPERIMENTAL=1
253 + else
254 + unset DOCKER_EXPERIMENTAL
255 + fi
256 +
257 + # time to build!
258 + ./hack/make.sh dynbinary || die 'dynbinary failed'
259 +
260 + # build the man pages too
261 + ./man/md2man-all.sh || die "unable to generate man pages"
262 +}
263 +
264 +src_install() {
265 + VERSION="$(cat VERSION)"
266 + newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
267 + newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
268 + newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
269 + dosym containerd /usr/bin/docker-containerd
270 + dosym containerd-shim /usr/bin/docker-containerd-shim
271 + dosym runc /usr/bin/docker-runc
272 +
273 + newinitd contrib/init/openrc/docker.initd docker
274 + newconfd contrib/init/openrc/docker.confd docker
275 +
276 + systemd_dounit contrib/init/systemd/docker.{service,socket}
277 +
278 + udev_dorules contrib/udev/*.rules
279 +
280 + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
281 + dodoc -r docs/*
282 + doman man/man*/*
283 +
284 + dobashcomp contrib/completion/bash/*
285 +
286 + insinto /usr/share/zsh/site-functions
287 + doins contrib/completion/zsh/*
288 +
289 + insinto /usr/share/vim/vimfiles
290 + doins -r contrib/syntax/vim/ftdetect
291 + doins -r contrib/syntax/vim/syntax
292 +
293 + # note: intentionally not using "doins" so that we preserve +x bits
294 + mkdir -p "${D}/usr/share/${PN}/contrib"
295 + cp -R contrib/* "${D}/usr/share/${PN}/contrib"
296 +}
297 +
298 +pkg_postinst() {
299 + udev_reload
300 +
301 + elog
302 + elog "To use Docker, the Docker daemon must be running as root. To automatically"
303 + elog "start the Docker daemon at boot, add Docker to the default runlevel:"
304 + elog " rc-update add docker default"
305 + elog "Similarly for systemd:"
306 + elog " systemctl enable docker.service"
307 + elog
308 + elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
309 + elog " usermod -aG docker youruser"
310 + elog
311 +}