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