1 |
commit: c31a29214010ceb770c130c6f83bd93379d3842c |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 5 20:49:50 2017 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 5 20:49:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31a2921 |
7 |
|
8 |
app-emulation/docker: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.4 |
11 |
|
12 |
app-emulation/docker/Manifest | 1 - |
13 |
app-emulation/docker/docker-17.03.2.ebuild | 292 --------------------- |
14 |
.../docker/files/1.13.1-split-openrc-log.patch | 54 ---- |
15 |
3 files changed, 347 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest |
18 |
index f907a9b46c9..35b23bcf9da 100644 |
19 |
--- a/app-emulation/docker/Manifest |
20 |
+++ b/app-emulation/docker/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST docker-17.03.2.tar.gz 7783969 SHA256 171a65c44340c7b5710da6948b0afb9306b126b36c531ddab1a3653fd2980aaa SHA512 9fad6c1fa38f9a14208547ca2d3d6a11a565fe4cebd7b432ccad9e2a57ab4a005df20415d1c797f747a99d309b07d8ec97bb45c67644554622aafe0bf1893e04 WHIRLPOOL e34f04698e4a510ed26c9e8f87510878a940d77dc7558df40173a8ea452a2843327196dea3099844dc389a051e23294671b3bc835120af3ca1f4c9c758de44a3 |
23 |
DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585beab4ded64251958804a102a5269 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b WHIRLPOOL d0cc166319dbf735d67796df3836f79b24b9108327276ca0ba272398cdc70d6fae4649d9097b6dd29e62633ee636a216343e0d3ffd781cf63ef4c7a7c8cea259 |
24 |
DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b |
25 |
DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae |
26 |
|
27 |
diff --git a/app-emulation/docker/docker-17.03.2.ebuild b/app-emulation/docker/docker-17.03.2.ebuild |
28 |
deleted file mode 100644 |
29 |
index d74e50ededc..00000000000 |
30 |
--- a/app-emulation/docker/docker-17.03.2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,292 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
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="f5ec1e2" |
48 |
- EGIT_COMMIT="v${MY_PV}-ce" |
49 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
50 |
- KEYWORDS="amd64 ~arm" |
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 +container-init +device-mapper hardened overlay pkcs11 seccomp" |
61 |
- |
62 |
-# https://github.com/docker/docker/blob/master/project/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.16.1 |
79 |
- ) |
80 |
-" |
81 |
- |
82 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies |
83 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies |
84 |
-# Runc/Containerd: Unfortunately docker does not version the releases, in order to avoid |
85 |
-# incompatiblities we depend on snapshots |
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.5_p20170308 |
96 |
- ~app-emulation/docker-runc-1.0.0_rc2_p20170308[apparmor?,seccomp?] |
97 |
- app-emulation/docker-proxy |
98 |
- container-init? ( >=sys-process/tini-0.13.0[static] ) |
99 |
-" |
100 |
- |
101 |
-RESTRICT="installsources strip" |
102 |
- |
103 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
104 |
- |
105 |
-# see "contrib/check-config.sh" from upstream's sources |
106 |
-CONFIG_CHECK=" |
107 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
108 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
109 |
- ~KEYS |
110 |
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
111 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
112 |
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
113 |
- ~NF_NAT ~NF_NAT_NEEDED |
114 |
- ~POSIX_MQUEUE |
115 |
- |
116 |
- ~USER_NS |
117 |
- ~SECCOMP |
118 |
- ~CGROUP_PIDS |
119 |
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
120 |
- |
121 |
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED |
122 |
- ~CGROUP_PERF |
123 |
- ~CGROUP_HUGETLB |
124 |
- ~NET_CLS_CGROUP |
125 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
126 |
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR |
127 |
- |
128 |
- ~VXLAN |
129 |
- ~XFRM_ALGO ~XFRM_USER |
130 |
- ~IPVLAN |
131 |
- ~MACVLAN ~DUMMY |
132 |
-" |
133 |
- |
134 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory" |
135 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
136 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
137 |
- |
138 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
139 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
140 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
141 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
142 |
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" |
143 |
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" |
144 |
- |
145 |
-PATCHES=( |
146 |
- "${FILESDIR}"/1.13.1-split-openrc-log.patch |
147 |
-) |
148 |
- |
149 |
-pkg_setup() { |
150 |
- if kernel_is lt 3 10; then |
151 |
- ewarn "" |
152 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
153 |
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" |
154 |
- fi |
155 |
- |
156 |
- # for where these kernel versions come from, see: |
157 |
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* |
158 |
- if ! { |
159 |
- kernel_is ge 3 16 \ |
160 |
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ |
161 |
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ |
162 |
- || { kernel_is 3 12 && kernel_is ge 3 12 25; } |
163 |
- }; then |
164 |
- ewarn "" |
165 |
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" |
166 |
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" |
167 |
- ewarn "" |
168 |
- ewarn "See also https://github.com/docker/docker/issues/2960" |
169 |
- fi |
170 |
- |
171 |
- if kernel_is le 3 18; then |
172 |
- CONFIG_CHECK+=" |
173 |
- ~RESOURCE_COUNTERS |
174 |
- " |
175 |
- fi |
176 |
- |
177 |
- if kernel_is le 3 13; then |
178 |
- CONFIG_CHECK+=" |
179 |
- ~NETPRIO_CGROUP |
180 |
- " |
181 |
- else |
182 |
- CONFIG_CHECK+=" |
183 |
- ~CGROUP_NET_PRIO |
184 |
- " |
185 |
- fi |
186 |
- |
187 |
- if kernel_is lt 4 5; then |
188 |
- CONFIG_CHECK+=" |
189 |
- ~MEMCG_KMEM |
190 |
- " |
191 |
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
192 |
- fi |
193 |
- |
194 |
- if kernel_is lt 4 7; then |
195 |
- CONFIG_CHECK+=" |
196 |
- ~DEVPTS_MULTIPLE_INSTANCES |
197 |
- " |
198 |
- fi |
199 |
- |
200 |
- if use aufs; then |
201 |
- CONFIG_CHECK+=" |
202 |
- ~AUFS_FS |
203 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
204 |
- " |
205 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" |
206 |
- fi |
207 |
- |
208 |
- if use btrfs; then |
209 |
- CONFIG_CHECK+=" |
210 |
- ~BTRFS_FS |
211 |
- ~BTRFS_FS_POSIX_ACL |
212 |
- " |
213 |
- fi |
214 |
- |
215 |
- if use device-mapper; then |
216 |
- CONFIG_CHECK+=" |
217 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
218 |
- " |
219 |
- fi |
220 |
- |
221 |
- if use overlay; then |
222 |
- CONFIG_CHECK+=" |
223 |
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL |
224 |
- " |
225 |
- fi |
226 |
- |
227 |
- linux-info_pkg_setup |
228 |
- |
229 |
- # create docker group for the code checking for it in /etc/group |
230 |
- enewgroup docker |
231 |
-} |
232 |
- |
233 |
-src_compile() { |
234 |
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" |
235 |
- |
236 |
- # setup CFLAGS and LDFLAGS for separate build target |
237 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
238 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
239 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
240 |
- |
241 |
- # if we're building from a tarball, we need the GITCOMMIT value |
242 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
243 |
- |
244 |
- if use hardened; then |
245 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
246 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
247 |
- |
248 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
249 |
- -i hack/make/dynbinary-client || die |
250 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
251 |
- -i hack/make/dynbinary-daemon || die |
252 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' |
253 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' |
254 |
- fi |
255 |
- |
256 |
- # let's set up some optional features :) |
257 |
- export DOCKER_BUILDTAGS='' |
258 |
- for gd in aufs btrfs device-mapper overlay; do |
259 |
- if ! use $gd; then |
260 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
261 |
- fi |
262 |
- done |
263 |
- |
264 |
- for tag in apparmor pkcs11 seccomp; do |
265 |
- if use $tag; then |
266 |
- DOCKER_BUILDTAGS+=" $tag" |
267 |
- fi |
268 |
- done |
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 |
- dosym containerd /usr/bin/docker-containerd |
282 |
- dosym containerd-shim /usr/bin/docker-containerd-shim |
283 |
- dosym runc /usr/bin/docker-runc |
284 |
- use container-init && dosym tini /usr/bin/docker-init |
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 |
- dodir /usr/share/${PN}/contrib |
308 |
- cp -R contrib/* "${ED}/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 |
-} |
325 |
|
326 |
diff --git a/app-emulation/docker/files/1.13.1-split-openrc-log.patch b/app-emulation/docker/files/1.13.1-split-openrc-log.patch |
327 |
deleted file mode 100644 |
328 |
index c7cdd224dcd..00000000000 |
329 |
--- a/app-emulation/docker/files/1.13.1-split-openrc-log.patch |
330 |
+++ /dev/null |
331 |
@@ -1,54 +0,0 @@ |
332 |
-From 65c1a3be5bf748f95edc45f1391c869bf4ff4a52 Mon Sep 17 00:00:00 2001 |
333 |
-From: William Hubbs <w.d.hubbs@×××××.com> |
334 |
-Date: Thu, 23 Feb 2017 17:07:26 -0600 |
335 |
-Subject: [PATCH] contrib/init/openrc: allow separate logs for stdout and |
336 |
- stderr |
337 |
- |
338 |
-Signed-off-by: William Hubbs <w.d.hubbs@×××××.com> |
339 |
---- |
340 |
- contrib/init/openrc/docker.confd | 10 ++++++++++ |
341 |
- contrib/init/openrc/docker.initd | 4 +++- |
342 |
- 2 files changed, 13 insertions(+), 1 deletion(-) |
343 |
- |
344 |
-diff --git a/contrib/init/openrc/docker.confd b/contrib/init/openrc/docker.confd |
345 |
-index 2444031..89183de 100644 |
346 |
---- a/contrib/init/openrc/docker.confd |
347 |
-+++ b/contrib/init/openrc/docker.confd |
348 |
-@@ -1,8 +1,18 @@ |
349 |
- # /etc/conf.d/docker: config file for /etc/init.d/docker |
350 |
- |
351 |
- # where the docker daemon output gets piped |
352 |
-+# this contains both stdout and stderr. If you need to separate them, |
353 |
-+# see the settings below |
354 |
- #DOCKER_LOGFILE="/var/log/docker.log" |
355 |
- |
356 |
-+# where the docker daemon stdout gets piped |
357 |
-+# if this is not set, DOCKER_LOGFILE is used |
358 |
-+#DOCKER_OUTFILE="/var/log/docker-out.log" |
359 |
-+ |
360 |
-+# where the docker daemon stderr gets piped |
361 |
-+# if this is not set, DOCKER_LOGFILE is used |
362 |
-+#DOCKER_ERRFILE="/var/log/docker-err.log" |
363 |
-+ |
364 |
- # where docker's pid get stored |
365 |
- #DOCKER_PIDFILE="/run/docker.pid" |
366 |
- |
367 |
-diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd |
368 |
-index 5d31603..6c968f6 100644 |
369 |
---- a/contrib/init/openrc/docker.initd |
370 |
-+++ b/contrib/init/openrc/docker.initd |
371 |
-@@ -6,8 +6,10 @@ command="${DOCKERD_BINARY:-/usr/bin/dockerd}" |
372 |
- pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" |
373 |
- command_args="-p \"${pidfile}\" ${DOCKER_OPTS}" |
374 |
- DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" |
375 |
-+DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}" |
376 |
-+DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}" |
377 |
- start_stop_daemon_args="--background \ |
378 |
-- --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\"" |
379 |
-+ --stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\"" |
380 |
- |
381 |
- start_pre() { |
382 |
- checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" |
383 |
--- |
384 |
-2.10.2 |
385 |
- |