1 |
commit: 07664ff8c9aa6fcb44d31937ba53ed51d02c030f |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 23 14:02:25 2017 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 14:02:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07664ff8 |
7 |
|
8 |
app-emulation/docker: remove old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.0, Repoman-2.3.1 |
11 |
|
12 |
app-emulation/docker/Manifest | 2 - |
13 |
app-emulation/docker/docker-1.11.0.ebuild | 275 -------------------- |
14 |
app-emulation/docker/docker-1.13.0_rc7.ebuild | 287 --------------------- |
15 |
app-emulation/docker/files/docker-containerd.patch | 22 -- |
16 |
4 files changed, 586 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest |
19 |
index efd93a0..f54cf9c 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.6.tar.gz 13694205 SHA256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e SHA512 98e0fa0ec0dad4d392188b0d2cf42b2b564403463c369e1fe060f1abc2e97d97375a88587080671ef905e6a34b991d83265f43c3112575af019cf85eef0c2c25 WHIRLPOOL 55d10e4c4ab960320094637a847768ad85dc1fccaa6cc77ea0ca82f2d23b27e92e2f2c0cbc03f53676012c95883f65c6fa16d26970138fa129d37bf278fc8c0b |
25 |
DIST docker-1.13.0.tar.gz 7746065 SHA256 845cc9a7a48ed1cc60f062882285358a1c2a845b74c5d1d859606a28e4a47d3e SHA512 c5531f0c4bfeb541a4bf9b324830afaa27edb99f34990bdfa588843baa169edb1c2d545452ee8074a1ac322e7788952eb369db884c015e29763247e1e023172c WHIRLPOOL 87fcadde4ef2c15d432b38e06c4ed4d6df03bb6ecddd24e489712020c2be3932da2f9ff47c2fc78dd0b56dacb94b89dc58a2d1c7d8995e1e5b834acd28a33011 |
26 |
-DIST docker-1.13.0_rc7.tar.gz 7745191 SHA256 fe87ec128309c9cd212690844d799ceb83a0ef25fca0a6b4a0c4f58c60f79391 SHA512 4f574bee7d0ef2d734843418f7e13e7ba83cc22b2b98261771fbfd40854a0a7efaf3eeb152662d00d21aaba7b6fe7d7e5de051ba7fd6919da8d28a7470023f3b WHIRLPOOL 10252222d7e7c598c808c7b01f3d658fab379462ff3c5a6cdb70d2b2dd9a73c052f436be170ffe74e73b21bf49e761205102ac049b0f0363aaa29d81991d2721 |
27 |
|
28 |
diff --git a/app-emulation/docker/docker-1.11.0.ebuild b/app-emulation/docker/docker-1.11.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 43b5a38..00000000 |
31 |
--- a/app-emulation/docker/docker-1.11.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,275 +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=5 |
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 golang-base git-r3 |
47 |
-else |
48 |
- MY_PV="${PV/_/-}" |
49 |
- DOCKER_GITCOMMIT="4dc5990" |
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 linux-info multilib 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? ( |
71 |
- >=sys-libs/libseccomp-2.2.1[static-libs] |
72 |
- ) |
73 |
-" |
74 |
- |
75 |
-DEPEND=" |
76 |
- ${CDEPEND} |
77 |
- |
78 |
- dev-go/go-md2man |
79 |
- |
80 |
- btrfs? ( |
81 |
- >=sys-fs/btrfs-progs-3.8 |
82 |
- ) |
83 |
-" |
84 |
- |
85 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies |
86 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies |
87 |
-RDEPEND=" |
88 |
- ${CDEPEND} |
89 |
- |
90 |
- !app-emulation/docker-bin |
91 |
- >=net-firewall/iptables-1.4 |
92 |
- sys-process/procps |
93 |
- >=dev-vcs/git-1.7 |
94 |
- >=app-arch/xz-utils-4.9 |
95 |
- |
96 |
- >=app-emulation/containerd-0.2.0 |
97 |
- >=app-emulation/runc-0.1.0 |
98 |
- |
99 |
- apparmor? ( |
100 |
- sys-libs/libapparmor[static-libs] |
101 |
- ) |
102 |
-" |
103 |
- |
104 |
-RESTRICT="installsources strip" |
105 |
- |
106 |
-# see "contrib/check-config.sh" from upstream's sources |
107 |
-CONFIG_CHECK=" |
108 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
109 |
- ~DEVPTS_MULTIPLE_INSTANCES |
110 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
111 |
- ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
112 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
113 |
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
114 |
- ~NF_NAT ~NF_NAT_NEEDED |
115 |
- |
116 |
- ~POSIX_MQUEUE |
117 |
- |
118 |
- ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
119 |
- |
120 |
- ~BLK_CGROUP ~IOSCHED_CFQ |
121 |
- ~CGROUP_PERF |
122 |
- ~CGROUP_HUGETLB |
123 |
- ~NET_CLS_CGROUP |
124 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
125 |
-" |
126 |
- |
127 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory, see bug 581348" |
128 |
-ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
129 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
130 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
131 |
- |
132 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
133 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
134 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
135 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
136 |
- |
137 |
-pkg_setup() { |
138 |
- if kernel_is lt 3 10; then |
139 |
- ewarn "" |
140 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
141 |
- ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" |
142 |
- fi |
143 |
- |
144 |
- # for where these kernel versions come from, see: |
145 |
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* |
146 |
- if ! { |
147 |
- kernel_is ge 3 16 \ |
148 |
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ |
149 |
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ |
150 |
- || { kernel_is 3 12 && kernel_is ge 3 12 25; } |
151 |
- }; then |
152 |
- ewarn "" |
153 |
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" |
154 |
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" |
155 |
- ewarn "" |
156 |
- ewarn "See also https://github.com/docker/docker/issues/2960" |
157 |
- fi |
158 |
- |
159 |
- if kernel_is le 3 18; then |
160 |
- CONFIG_CHECK+=" |
161 |
- ~RESOURCE_COUNTERS |
162 |
- " |
163 |
- fi |
164 |
- |
165 |
- if kernel_is le 3 13; then |
166 |
- CONFIG_CHECK+=" |
167 |
- ~NETPRIO_CGROUP |
168 |
- " |
169 |
- else |
170 |
- CONFIG_CHECK+=" |
171 |
- ~CGROUP_NET_PRIO |
172 |
- " |
173 |
- fi |
174 |
- |
175 |
- if use aufs; then |
176 |
- CONFIG_CHECK+=" |
177 |
- ~AUFS_FS |
178 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
179 |
- " |
180 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" |
181 |
- fi |
182 |
- |
183 |
- if use btrfs; then |
184 |
- CONFIG_CHECK+=" |
185 |
- ~BTRFS_FS |
186 |
- " |
187 |
- fi |
188 |
- |
189 |
- if use device-mapper; then |
190 |
- CONFIG_CHECK+=" |
191 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
192 |
- " |
193 |
- fi |
194 |
- |
195 |
- if use overlay; then |
196 |
- CONFIG_CHECK+=" |
197 |
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL |
198 |
- " |
199 |
- fi |
200 |
- |
201 |
- linux-info_pkg_setup |
202 |
- |
203 |
- # create docker group for the code checking for it in /etc/group |
204 |
- enewgroup docker |
205 |
-} |
206 |
- |
207 |
-src_prepare() { |
208 |
- cd "src/${EGO_PN}" || die |
209 |
- epatch "${FILESDIR}/docker-containerd.patch" |
210 |
- # allow user patches (use sparingly - upstream won't support them) |
211 |
- epatch_user |
212 |
-} |
213 |
- |
214 |
-src_compile() { |
215 |
- cd "src/${EGO_PN}" || die |
216 |
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" |
217 |
- |
218 |
- # setup CFLAGS and LDFLAGS for separate build target |
219 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
220 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
221 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
222 |
- |
223 |
- # if we're building from a zip, we need the GITCOMMIT value |
224 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
225 |
- |
226 |
- if gcc-specs-pie; then |
227 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
228 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
229 |
- |
230 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
231 |
- -i hack/make/dynbinary || die |
232 |
- grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' |
233 |
- fi |
234 |
- |
235 |
- # let's set up some optional features :) |
236 |
- export DOCKER_BUILDTAGS='' |
237 |
- for gd in aufs btrfs device-mapper overlay; do |
238 |
- if ! use $gd; then |
239 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
240 |
- fi |
241 |
- done |
242 |
- |
243 |
- for tag in apparmor seccomp; do |
244 |
- if use $tag; then |
245 |
- DOCKER_BUILDTAGS+=" $tag" |
246 |
- fi |
247 |
- done |
248 |
- |
249 |
- # https://github.com/docker/docker/pull/13338 |
250 |
- if use experimental; then |
251 |
- export DOCKER_EXPERIMENTAL=1 |
252 |
- else |
253 |
- unset DOCKER_EXPERIMENTAL |
254 |
- fi |
255 |
- |
256 |
- # time to build! |
257 |
- ./hack/make.sh dynbinary || die 'dynbinary failed' |
258 |
- |
259 |
- # build the man pages too |
260 |
- ./man/md2man-all.sh || die "unable to generate man pages" |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- cd "src/${EGO_PN}" || die |
265 |
- VERSION="$(cat VERSION)" |
266 |
- newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker |
267 |
- #exeinto /usr/libexec/docker |
268 |
- #newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit |
269 |
- |
270 |
- newinitd contrib/init/openrc/docker.initd docker |
271 |
- newconfd contrib/init/openrc/docker.confd docker |
272 |
- |
273 |
- systemd_dounit contrib/init/systemd/docker.{service,socket} |
274 |
- |
275 |
- udev_dorules contrib/udev/*.rules |
276 |
- |
277 |
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
278 |
- dodoc -r docs/* |
279 |
- doman man/man*/* |
280 |
- |
281 |
- dobashcomp contrib/completion/bash/* |
282 |
- |
283 |
- insinto /usr/share/zsh/site-functions |
284 |
- doins contrib/completion/zsh/* |
285 |
- |
286 |
- insinto /usr/share/vim/vimfiles |
287 |
- doins -r contrib/syntax/vim/ftdetect |
288 |
- doins -r contrib/syntax/vim/syntax |
289 |
- |
290 |
- # note: intentionally not using "doins" so that we preserve +x bits |
291 |
- mkdir -p "${D}/usr/share/${PN}/contrib" |
292 |
- cp -R contrib/* "${D}/usr/share/${PN}/contrib" |
293 |
-} |
294 |
- |
295 |
-pkg_postinst() { |
296 |
- udev_reload |
297 |
- |
298 |
- elog |
299 |
- elog "To use Docker, the Docker daemon must be running as root. To automatically" |
300 |
- elog "start the Docker daemon at boot, add Docker to the default runlevel:" |
301 |
- elog " rc-update add docker default" |
302 |
- elog "Similarly for systemd:" |
303 |
- elog " systemctl enable docker.service" |
304 |
- elog |
305 |
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:" |
306 |
- elog " usermod -aG docker youruser" |
307 |
- elog |
308 |
-} |
309 |
|
310 |
diff --git a/app-emulation/docker/docker-1.13.0_rc7.ebuild b/app-emulation/docker/docker-1.13.0_rc7.ebuild |
311 |
deleted file mode 100644 |
312 |
index a631cb0..00000000 |
313 |
--- a/app-emulation/docker/docker-1.13.0_rc7.ebuild |
314 |
+++ /dev/null |
315 |
@@ -1,287 +0,0 @@ |
316 |
-# Copyright 1999-2017 Gentoo Foundation |
317 |
-# Distributed under the terms of the GNU General Public License v2 |
318 |
-# $Id$ |
319 |
- |
320 |
-EAPI=6 |
321 |
- |
322 |
-EGO_PN="github.com/docker/docker" |
323 |
- |
324 |
-if [[ ${PV} = *9999* ]]; then |
325 |
- # Docker cannot be fetched via "go get", thanks to autogenerated code |
326 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
327 |
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" |
328 |
- inherit git-r3 |
329 |
-else |
330 |
- MY_PV="${PV/_/-}" |
331 |
- DOCKER_GITCOMMIT="48a9e53" |
332 |
- EGIT_COMMIT="v${MY_PV}" |
333 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
334 |
- KEYWORDS="~amd64" |
335 |
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" |
336 |
- inherit golang-vcs-snapshot |
337 |
-fi |
338 |
-inherit bash-completion-r1 golang-base linux-info systemd udev user |
339 |
- |
340 |
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers" |
341 |
-HOMEPAGE="https://dockerproject.org" |
342 |
-LICENSE="Apache-2.0" |
343 |
-SLOT="0" |
344 |
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp" |
345 |
- |
346 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies |
347 |
-CDEPEND=" |
348 |
- >=dev-db/sqlite-3.7.9:3 |
349 |
- device-mapper? ( |
350 |
- >=sys-fs/lvm2-2.02.89[thin] |
351 |
- ) |
352 |
- seccomp? ( >=sys-libs/libseccomp-2.2.1 ) |
353 |
- apparmor? ( sys-libs/libapparmor ) |
354 |
-" |
355 |
- |
356 |
-DEPEND=" |
357 |
- ${CDEPEND} |
358 |
- |
359 |
- dev-go/go-md2man |
360 |
- |
361 |
- btrfs? ( |
362 |
- >=sys-fs/btrfs-progs-3.16.1 |
363 |
- ) |
364 |
-" |
365 |
- |
366 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies |
367 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies |
368 |
-RDEPEND=" |
369 |
- ${CDEPEND} |
370 |
- |
371 |
- !app-emulation/docker-bin |
372 |
- >=net-firewall/iptables-1.4 |
373 |
- sys-process/procps |
374 |
- >=dev-vcs/git-1.7 |
375 |
- >=app-arch/xz-utils-4.9 |
376 |
- |
377 |
- >=app-emulation/containerd-0.2.5 |
378 |
- app-emulation/runc[apparmor?,seccomp?] |
379 |
- app-emulation/docker-proxy |
380 |
- container-init? ( >=sys-process/tini-0.13.0[static] ) |
381 |
-" |
382 |
- |
383 |
-RESTRICT="installsources strip" |
384 |
- |
385 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
386 |
- |
387 |
-# see "contrib/check-config.sh" from upstream's sources |
388 |
-CONFIG_CHECK=" |
389 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
390 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
391 |
- ~KEYS |
392 |
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
393 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
394 |
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
395 |
- ~NF_NAT ~NF_NAT_NEEDED |
396 |
- ~POSIX_MQUEUE |
397 |
- |
398 |
- ~USER_NS |
399 |
- ~SECCOMP |
400 |
- ~CGROUP_PIDS |
401 |
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
402 |
- |
403 |
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED |
404 |
- ~CGROUP_PERF |
405 |
- ~CGROUP_HUGETLB |
406 |
- ~NET_CLS_CGROUP |
407 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
408 |
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT |
409 |
- |
410 |
- ~VXLAN |
411 |
- ~XFRM_ALGO ~XFRM_USER |
412 |
- ~IPVLAN |
413 |
- ~MACVLAN ~DUMMY |
414 |
-" |
415 |
- |
416 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory" |
417 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
418 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
419 |
- |
420 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
421 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
422 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
423 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
424 |
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" |
425 |
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" |
426 |
- |
427 |
-pkg_setup() { |
428 |
- if kernel_is lt 3 10; then |
429 |
- ewarn "" |
430 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
431 |
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" |
432 |
- fi |
433 |
- |
434 |
- # for where these kernel versions come from, see: |
435 |
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* |
436 |
- if ! { |
437 |
- kernel_is ge 3 16 \ |
438 |
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ |
439 |
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ |
440 |
- || { kernel_is 3 12 && kernel_is ge 3 12 25; } |
441 |
- }; then |
442 |
- ewarn "" |
443 |
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" |
444 |
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" |
445 |
- ewarn "" |
446 |
- ewarn "See also https://github.com/docker/docker/issues/2960" |
447 |
- fi |
448 |
- |
449 |
- if kernel_is le 3 18; then |
450 |
- CONFIG_CHECK+=" |
451 |
- ~RESOURCE_COUNTERS |
452 |
- " |
453 |
- fi |
454 |
- |
455 |
- if kernel_is le 3 13; then |
456 |
- CONFIG_CHECK+=" |
457 |
- ~NETPRIO_CGROUP |
458 |
- " |
459 |
- else |
460 |
- CONFIG_CHECK+=" |
461 |
- ~CGROUP_NET_PRIO |
462 |
- " |
463 |
- fi |
464 |
- |
465 |
- if kernel_is lt 4 5; then |
466 |
- CONFIG_CHECK+=" |
467 |
- ~MEMCG_KMEM |
468 |
- " |
469 |
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
470 |
- fi |
471 |
- |
472 |
- if kernel_is lt 4 7; then |
473 |
- CONFIG_CHECK+=" |
474 |
- ~DEVPTS_MULTIPLE_INSTANCES |
475 |
- " |
476 |
- fi |
477 |
- |
478 |
- if use aufs; then |
479 |
- CONFIG_CHECK+=" |
480 |
- ~AUFS_FS |
481 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
482 |
- " |
483 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" |
484 |
- fi |
485 |
- |
486 |
- if use btrfs; then |
487 |
- CONFIG_CHECK+=" |
488 |
- ~BTRFS_FS |
489 |
- ~BTRFS_FS_POSIX_ACL |
490 |
- " |
491 |
- fi |
492 |
- |
493 |
- if use device-mapper; then |
494 |
- CONFIG_CHECK+=" |
495 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
496 |
- " |
497 |
- fi |
498 |
- |
499 |
- if use overlay; then |
500 |
- CONFIG_CHECK+=" |
501 |
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL |
502 |
- " |
503 |
- fi |
504 |
- |
505 |
- linux-info_pkg_setup |
506 |
- |
507 |
- # create docker group for the code checking for it in /etc/group |
508 |
- enewgroup docker |
509 |
-} |
510 |
- |
511 |
-src_compile() { |
512 |
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" |
513 |
- |
514 |
- # setup CFLAGS and LDFLAGS for separate build target |
515 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
516 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
517 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
518 |
- |
519 |
- # if we're building from a tarball, we need the GITCOMMIT value |
520 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
521 |
- |
522 |
- if use hardened; then |
523 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
524 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
525 |
- |
526 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
527 |
- -i hack/make/dynbinary-client || die |
528 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
529 |
- -i hack/make/dynbinary-daemon || die |
530 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' |
531 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' |
532 |
- fi |
533 |
- |
534 |
- # let's set up some optional features :) |
535 |
- export DOCKER_BUILDTAGS='' |
536 |
- for gd in aufs btrfs device-mapper overlay; do |
537 |
- if ! use $gd; then |
538 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
539 |
- fi |
540 |
- done |
541 |
- |
542 |
- for tag in apparmor pkcs11 seccomp; do |
543 |
- if use $tag; then |
544 |
- DOCKER_BUILDTAGS+=" $tag" |
545 |
- fi |
546 |
- done |
547 |
- |
548 |
- # time to build! |
549 |
- ./hack/make.sh dynbinary || die 'dynbinary failed' |
550 |
- |
551 |
- # build the man pages too |
552 |
- ./man/md2man-all.sh || die "unable to generate man pages" |
553 |
-} |
554 |
- |
555 |
-src_install() { |
556 |
- VERSION="$(cat VERSION)" |
557 |
- newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker |
558 |
- newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd |
559 |
- dosym containerd /usr/bin/docker-containerd |
560 |
- dosym containerd-shim /usr/bin/docker-containerd-shim |
561 |
- dosym runc /usr/bin/docker-runc |
562 |
- use container-init && dosym tini /usr/bin/docker-init |
563 |
- |
564 |
- newinitd contrib/init/openrc/docker.initd docker |
565 |
- newconfd contrib/init/openrc/docker.confd docker |
566 |
- |
567 |
- systemd_dounit contrib/init/systemd/docker.{service,socket} |
568 |
- |
569 |
- udev_dorules contrib/udev/*.rules |
570 |
- |
571 |
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
572 |
- dodoc -r docs/* |
573 |
- doman man/man*/* |
574 |
- |
575 |
- dobashcomp contrib/completion/bash/* |
576 |
- |
577 |
- insinto /usr/share/zsh/site-functions |
578 |
- doins contrib/completion/zsh/_* |
579 |
- |
580 |
- insinto /usr/share/vim/vimfiles |
581 |
- doins -r contrib/syntax/vim/ftdetect |
582 |
- doins -r contrib/syntax/vim/syntax |
583 |
- |
584 |
- # note: intentionally not using "doins" so that we preserve +x bits |
585 |
- dodir /usr/share/${PN}/contrib |
586 |
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib" |
587 |
-} |
588 |
- |
589 |
-pkg_postinst() { |
590 |
- udev_reload |
591 |
- |
592 |
- elog |
593 |
- elog "To use Docker, the Docker daemon must be running as root. To automatically" |
594 |
- elog "start the Docker daemon at boot, add Docker to the default runlevel:" |
595 |
- elog " rc-update add docker default" |
596 |
- elog "Similarly for systemd:" |
597 |
- elog " systemctl enable docker.service" |
598 |
- elog |
599 |
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:" |
600 |
- elog " usermod -aG docker youruser" |
601 |
- elog |
602 |
-} |
603 |
|
604 |
diff --git a/app-emulation/docker/files/docker-containerd.patch b/app-emulation/docker/files/docker-containerd.patch |
605 |
deleted file mode 100644 |
606 |
index c53e82e..00000000 |
607 |
--- a/app-emulation/docker/files/docker-containerd.patch |
608 |
+++ /dev/null |
609 |
@@ -1,22 +0,0 @@ |
610 |
-diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go |
611 |
-index f0284ca..e44a1d1 100644 |
612 |
---- a/libcontainerd/remote_linux.go |
613 |
-+++ b/libcontainerd/remote_linux.go |
614 |
-@@ -27,7 +27,7 @@ const ( |
615 |
- maxConnectionRetryCount = 3 |
616 |
- connectionRetryDelay = 3 * time.Second |
617 |
- containerdShutdownTimeout = 15 * time.Second |
618 |
-- containerdBinary = "docker-containerd" |
619 |
-+ containerdBinary = "containerd" |
620 |
- containerdPidFilename = "docker-containerd.pid" |
621 |
- containerdSockFilename = "docker-containerd.sock" |
622 |
- eventTimestampFilename = "event.ts" |
623 |
-@@ -338,7 +338,7 @@ func (r *remote) runContainerdDaemon() error { |
624 |
- } |
625 |
- |
626 |
- // Start a new instance |
627 |
-- args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"} |
628 |
-+ args := []string{"-l", r.rpcAddr, "--runtime", "runc"} |
629 |
- if r.debugLog { |
630 |
- args = append(args, "--debug", "true") |
631 |
- } |