1 |
commit: a2bbd2980b75848c2d95477d91835bd96fd2a143 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 24 17:44:11 2016 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 24 17:44:11 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bbd298 |
7 |
|
8 |
app-emulation/docker: sync live ebuild |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-emulation/docker/docker-9999.ebuild | 34 +++++++++++++++------------------ |
13 |
1 file changed, 15 insertions(+), 19 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild |
16 |
index 4b3fc94..0667345 100644 |
17 |
--- a/app-emulation/docker/docker-9999.ebuild |
18 |
+++ b/app-emulation/docker/docker-9999.ebuild |
19 |
@@ -2,7 +2,7 @@ |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
# $Id$ |
22 |
|
23 |
-EAPI=5 |
24 |
+EAPI=6 |
25 |
|
26 |
EGO_PN="github.com/docker/docker" |
27 |
|
28 |
@@ -10,17 +10,17 @@ if [[ ${PV} = *9999* ]]; then |
29 |
# Docker cannot be fetched via "go get", thanks to autogenerated code |
30 |
EGIT_REPO_URI="https://${EGO_PN}.git" |
31 |
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" |
32 |
- inherit golang-base git-r3 |
33 |
+ inherit git-r3 |
34 |
else |
35 |
MY_PV="${PV/_/-}" |
36 |
- DOCKER_GITCOMMIT="4dc5990" |
37 |
+ DOCKER_GITCOMMIT="906eacd" |
38 |
EGIT_COMMIT="v${MY_PV}" |
39 |
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
40 |
KEYWORDS="~amd64" |
41 |
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" |
42 |
inherit golang-vcs-snapshot |
43 |
fi |
44 |
-inherit bash-completion-r1 linux-info multilib systemd udev user |
45 |
+inherit bash-completion-r1 golang-base linux-info systemd udev user |
46 |
|
47 |
DESCRIPTION="The core functions you need to create Docker images and run Docker containers" |
48 |
HOMEPAGE="https://dockerproject.org" |
49 |
@@ -34,9 +34,8 @@ CDEPEND=" |
50 |
device-mapper? ( |
51 |
>=sys-fs/lvm2-2.02.89[thin] |
52 |
) |
53 |
- seccomp? ( |
54 |
- >=sys-libs/libseccomp-2.2.1[static-libs] |
55 |
- ) |
56 |
+ seccomp? ( >=sys-libs/libseccomp-2.2.1 ) |
57 |
+ apparmor? ( sys-libs/libapparmor ) |
58 |
" |
59 |
|
60 |
DEPEND=" |
61 |
@@ -60,12 +59,8 @@ RDEPEND=" |
62 |
>=dev-vcs/git-1.7 |
63 |
>=app-arch/xz-utils-4.9 |
64 |
|
65 |
- >=app-emulation/containerd-0.2.0 |
66 |
- >=app-emulation/runc-0.1.0 |
67 |
- |
68 |
- apparmor? ( |
69 |
- sys-libs/libapparmor[static-libs] |
70 |
- ) |
71 |
+ >app-emulation/containerd-0.2.2 |
72 |
+ app-emulation/runc[apparmor?,seccomp?] |
73 |
" |
74 |
|
75 |
RESTRICT="installsources strip" |
76 |
@@ -75,7 +70,7 @@ CONFIG_CHECK=" |
77 |
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
78 |
~DEVPTS_MULTIPLE_INSTANCES |
79 |
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
80 |
- ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
81 |
+ ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
82 |
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
83 |
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
84 |
~NF_NAT ~NF_NAT_NEEDED |
85 |
@@ -91,6 +86,7 @@ CONFIG_CHECK=" |
86 |
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
87 |
" |
88 |
|
89 |
+ERROR_KEYS="CONFIG_KEYS: is mandatory" |
90 |
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
91 |
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
92 |
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
93 |
@@ -172,9 +168,10 @@ pkg_setup() { |
94 |
|
95 |
src_prepare() { |
96 |
cd "src/${EGO_PN}" || die |
97 |
- epatch "${FILESDIR}/docker-containerd.patch" |
98 |
+ sed -i 's/docker-containerd/containerd/g; s/docker-runc/runc/g' libcontainerd/remote_linux.go |
99 |
# allow user patches (use sparingly - upstream won't support them) |
100 |
- epatch_user |
101 |
+ cd - |
102 |
+ eapply_user |
103 |
} |
104 |
|
105 |
src_compile() { |
106 |
@@ -229,9 +226,8 @@ src_compile() { |
107 |
src_install() { |
108 |
cd "src/${EGO_PN}" || die |
109 |
VERSION="$(cat VERSION)" |
110 |
- newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker |
111 |
- #exeinto /usr/libexec/docker |
112 |
- #newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit |
113 |
+ newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker |
114 |
+ newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd |
115 |
|
116 |
newinitd contrib/init/openrc/docker.initd docker |
117 |
newconfd contrib/init/openrc/docker.confd docker |