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