1 |
gregkh 13/11/26 15:17:48 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: docker-0.7.0.ebuild |
5 |
Log: |
6 |
add 0.7.0 release |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 app-emulation/docker/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/metadata.xml,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- metadata.xml 25 Sep 2013 03:22:15 -0000 1.1 |
24 |
+++ metadata.xml 26 Nov 2013 15:17:48 -0000 1.2 |
25 |
@@ -8,8 +8,18 @@ |
26 |
scale, in production, on VMs, bare metal, OpenStack clusters, public |
27 |
clouds and more. |
28 |
</longdescription> |
29 |
- <maintainer> |
30 |
+ <maintainer status="active"> |
31 |
<email>admwiggin@×××××.com</email> |
32 |
<name>Tianon</name> |
33 |
</maintainer> |
34 |
+ <use> |
35 |
+ <flag name="aufs"> |
36 |
+ Enables dependencies for the "aufs" driver, including necessary |
37 |
+ kernel flags. |
38 |
+ </flag> |
39 |
+ <flag name="device-mapper"> |
40 |
+ Enables dependencies for the "device-mapper" driver, including |
41 |
+ necessary kernel flags. |
42 |
+ </flag> |
43 |
+ </use> |
44 |
</pkgmetadata> |
45 |
|
46 |
|
47 |
|
48 |
1.6 app-emulation/docker/ChangeLog |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.6&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.6&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.5&r2=1.6 |
53 |
|
54 |
Index: ChangeLog |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v |
57 |
retrieving revision 1.5 |
58 |
retrieving revision 1.6 |
59 |
diff -u -r1.5 -r1.6 |
60 |
--- ChangeLog 23 Nov 2013 23:13:28 -0000 1.5 |
61 |
+++ ChangeLog 26 Nov 2013 15:17:48 -0000 1.6 |
62 |
@@ -1,6 +1,12 @@ |
63 |
# ChangeLog for app-emulation/docker |
64 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.5 2013/11/23 23:13:28 gregkh Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.6 2013/11/26 15:17:48 gregkh Exp $ |
67 |
+ |
68 |
+*docker-0.7.0 (26 Nov 2013) |
69 |
+ |
70 |
+ 26 Nov 2013; Greg Kroah-Hartman <gregkh@g.o> +docker-0.7.0.ebuild, |
71 |
+ metadata.xml: |
72 |
+ add 0.7.0 release |
73 |
|
74 |
*docker-0.6.7 (23 Nov 2013) |
75 |
|
76 |
|
77 |
|
78 |
|
79 |
1.1 app-emulation/docker/docker-0.7.0.ebuild |
80 |
|
81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.7.0.ebuild?rev=1.1&view=markup |
82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.7.0.ebuild?rev=1.1&content-type=text/plain |
83 |
|
84 |
Index: docker-0.7.0.ebuild |
85 |
=================================================================== |
86 |
# Copyright 1999-2013 Gentoo Foundation |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.7.0.ebuild,v 1.1 2013/11/26 15:17:48 gregkh Exp $ |
89 |
|
90 |
EAPI=5 |
91 |
|
92 |
DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level." |
93 |
HOMEPAGE="http://www.docker.io/" |
94 |
SRC_URI="" |
95 |
|
96 |
EGIT_REPO_URI="git://github.com/dotcloud/docker.git" |
97 |
if [[ ${PV} == *9999 ]]; then |
98 |
KEYWORDS="" |
99 |
else |
100 |
EGIT_COMMIT="v${PV}" |
101 |
KEYWORDS="~amd64" |
102 |
fi |
103 |
|
104 |
inherit bash-completion-r1 git-2 linux-info systemd user |
105 |
|
106 |
LICENSE="Apache-2.0" |
107 |
SLOT="0" |
108 |
IUSE="aufs +device-mapper doc vim-syntax" |
109 |
|
110 |
CDEPEND=" |
111 |
>=dev-db/sqlite-3.7.9:3 |
112 |
device-mapper? ( |
113 |
sys-fs/lvm2[thin] |
114 |
) |
115 |
" |
116 |
DEPEND=" |
117 |
${CDEPEND} |
118 |
>=dev-lang/go-1.1.2 |
119 |
dev-vcs/git |
120 |
dev-vcs/mercurial |
121 |
doc? ( |
122 |
dev-python/sphinx |
123 |
dev-python/sphinxcontrib-httpdomain |
124 |
) |
125 |
" |
126 |
RDEPEND=" |
127 |
${CDEPEND} |
128 |
!app-emulation/docker-bin |
129 |
>=app-arch/tar-1.26 |
130 |
>=sys-apps/iproute2-3.5 |
131 |
>=net-firewall/iptables-1.4 |
132 |
>=app-emulation/lxc-0.8 |
133 |
>=dev-vcs/git-1.7 |
134 |
>=app-arch/xz-utils-4.9 |
135 |
aufs? ( |
136 |
|| ( |
137 |
sys-fs/aufs3 |
138 |
sys-kernel/aufs-sources |
139 |
) |
140 |
) |
141 |
" |
142 |
|
143 |
RESTRICT="strip" |
144 |
|
145 |
pkg_setup() { |
146 |
CONFIG_CHECK+=" |
147 |
~BRIDGE |
148 |
~MEMCG_SWAP |
149 |
~NETFILTER_XT_MATCH_ADDRTYPE |
150 |
~NF_NAT |
151 |
~NF_NAT_NEEDED |
152 |
" |
153 |
ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers" |
154 |
|
155 |
if use aufs; then |
156 |
CONFIG_CHECK+=" |
157 |
~AUFS_FS |
158 |
" |
159 |
ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used" |
160 |
fi |
161 |
|
162 |
if use device-mapper; then |
163 |
CONFIG_CHECK+=" |
164 |
~BLK_DEV_DM |
165 |
~DM_THIN_PROVISIONING |
166 |
~EXT4_FS |
167 |
" |
168 |
fi |
169 |
|
170 |
check_extra_config |
171 |
} |
172 |
|
173 |
src_unpack() { |
174 |
git-2_src_unpack |
175 |
} |
176 |
|
177 |
src_compile() { |
178 |
export GOPATH="${WORKDIR}/gopath" |
179 |
mkdir -p "$GOPATH" || die |
180 |
|
181 |
# make sure docker itself is in our shiny new GOPATH |
182 |
mkdir -p "${GOPATH}/src/github.com/dotcloud" || die |
183 |
ln -sf "$(pwd -P)" "${GOPATH}/src/github.com/dotcloud/docker" || die |
184 |
|
185 |
# we need our vendored deps, too |
186 |
export GOPATH="$GOPATH:$(pwd -P)/vendor" |
187 |
|
188 |
# time to build! |
189 |
./hack/make.sh dynbinary || die |
190 |
|
191 |
if use doc; then |
192 |
emake -C docs docs man || die |
193 |
fi |
194 |
} |
195 |
|
196 |
src_install() { |
197 |
VERSION=$(cat VERSION) |
198 |
newbin bundles/$VERSION/dynbinary/docker-$VERSION docker |
199 |
exeinto /usr/libexec/docker |
200 |
newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit |
201 |
|
202 |
newinitd contrib/init/openrc/docker.initd docker |
203 |
newconfd contrib/init/openrc/docker.confd docker |
204 |
|
205 |
systemd_dounit contrib/init/systemd/docker.service |
206 |
|
207 |
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
208 |
if use doc; then |
209 |
dohtml -r docs/_build/html/* |
210 |
doman docs/_build/man/* |
211 |
fi |
212 |
|
213 |
dobashcomp contrib/completion/bash/* |
214 |
|
215 |
insinto /usr/share/zsh/site-functions |
216 |
doins contrib/completion/zsh/* |
217 |
|
218 |
if use vim-syntax; then |
219 |
insinto /usr/share/vim/vimfiles |
220 |
doins -r contrib/vim-syntax/ftdetect |
221 |
doins -r contrib/vim-syntax/syntax |
222 |
fi |
223 |
|
224 |
insinto /usr/share/${P}/contrib |
225 |
doins contrib/README |
226 |
cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/" |
227 |
} |
228 |
|
229 |
pkg_postinst() { |
230 |
elog "" |
231 |
elog "To use docker, the docker daemon must be running as root. To automatically" |
232 |
elog "start the docker daemon at boot, add docker to the default runlevel:" |
233 |
elog " rc-update add docker default" |
234 |
elog "Similarly for systemd:" |
235 |
elog " systemctl enable docker.service" |
236 |
elog "" |
237 |
|
238 |
# create docker group if the code checking for it in /etc/group exists |
239 |
enewgroup docker |
240 |
|
241 |
elog "To use docker as a non-root user, add yourself to the docker group." |
242 |
elog "" |
243 |
|
244 |
ewarn "" |
245 |
ewarn "If you want your containers to have access to the public internet or even" |
246 |
ewarn "the existing private network, IP Forwarding must be enabled:" |
247 |
ewarn " sysctl -w net.ipv4.ip_forward=1" |
248 |
ewarn "or more permanently:" |
249 |
ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf" |
250 |
ewarn "Please be mindful of the security implications of enabling IP Forwarding." |
251 |
ewarn "" |
252 |
} |