1 |
commit: 25b2a5962a1c2af913c70a7d6fdcd466a09261e6 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 13 14:45:37 2016 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 13 14:45:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b2a596 |
7 |
|
8 |
app-emulation/docker: remove 1.12.2 release candidate |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
app-emulation/docker/Manifest | 1 - |
13 |
app-emulation/docker/docker-1.12.2_rc1.ebuild | 286 -------------------------- |
14 |
2 files changed, 287 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest |
17 |
index d27bc53..82d899d 100644 |
18 |
--- a/app-emulation/docker/Manifest |
19 |
+++ b/app-emulation/docker/Manifest |
20 |
@@ -2,4 +2,3 @@ DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e813 |
21 |
DIST docker-1.12.0.tar.gz 13018773 SHA256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 SHA512 113707c0447bc096dc59204a1666b9f3a4e92d0ad89f016a0259734d6eee47861d5a6b1febab61f357212f0b4ffceea7ed3a53f883a748604aeb65bb5701413b WHIRLPOOL aa817e74c00b3f4ec9f494336a8a2f46d41ff978a4d04f4400a3f6ba21b4271a8f80b3708c4e18f9517f974f8e4f59194edbd57e3a662910cb01483fa6332b48 |
22 |
DIST docker-1.12.1.tar.gz 13135631 SHA256 0c71255fc69ffec377800468e2b1c97681f150f3719ffa09829a17b717ff4e01 SHA512 8917e23d2826f45951710dcc47625c272405466661b7fa6b75fb7e143fdcc5c78cbf6a7475663b96b22126ba3c2dab3b3a8c11ca396dc8408d1aa9f2667c95e7 WHIRLPOOL 915707b6563f10670678b064031173e58a2aa9e380fbd95f0a11951ece3f7d53fbb5a62241a611bafb66edc116cfd9de62d144d62abcb4e2cd43e125863ab0b9 |
23 |
DIST docker-1.12.2.tar.gz 13680145 SHA256 29bc203e483c81c9a337b4a4186e6b0a23984c518b09478d8718c616b5923e88 SHA512 ef8dc9ee4817bad757f5e3396a7062076415305fe5e3ea3a8e04b3d4690119d27e81429d34450de7119c3039231b1e501806962cd529bb10d33c0884a9c05729 WHIRLPOOL f313383842f2e0e9ca7805c239da84283de9ac5c8778a501bb76f4be6b166b07394112b0fea88e52baa3e17094dbc569ccc2ac9b4ed493873e4210893e8115cc |
24 |
-DIST docker-1.12.2_rc1.tar.gz 13622885 SHA256 22200fb69e5fd51bf778a39aff0c7dcbce94069788967363f988dae543df881c SHA512 9fdbccc760e0393584cb55c5c959002eaea73d51b710cdbe5c5c098993e89e5a3ce8593832a7ffc7690238e04500b0ec2bd02c8e4b2eafe957a57915b1877aa3 WHIRLPOOL 11499ff9def165bc7b7bc411fde8391ea5402bce78b0deb23f1954b1dd5d45698d584efa5ff74c5e033651e6660a14a4ea1013c0548f50e0861fb067a6b0168b |
25 |
|
26 |
diff --git a/app-emulation/docker/docker-1.12.2_rc1.ebuild b/app-emulation/docker/docker-1.12.2_rc1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 28aeb49..00000000 |
29 |
--- a/app-emulation/docker/docker-1.12.2_rc1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,286 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
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="45bed2c" |
48 |
- EGIT_COMMIT="v${MY_PV}" |
49 |
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
50 |
- KEYWORDS="~amd64" |
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 +device-mapper experimental overlay seccomp" |
61 |
- |
62 |
-# https://github.com/docker/docker/blob/master/hack/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.8 |
79 |
- ) |
80 |
-" |
81 |
- |
82 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies |
83 |
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies |
84 |
-RDEPEND=" |
85 |
- ${CDEPEND} |
86 |
- |
87 |
- !app-emulation/docker-bin |
88 |
- >=net-firewall/iptables-1.4 |
89 |
- sys-process/procps |
90 |
- >=dev-vcs/git-1.7 |
91 |
- >=app-arch/xz-utils-4.9 |
92 |
- |
93 |
- >app-emulation/containerd-0.2.2 |
94 |
- app-emulation/runc[apparmor?,seccomp?] |
95 |
-" |
96 |
- |
97 |
-RESTRICT="installsources strip" |
98 |
- |
99 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
100 |
- |
101 |
-# see "contrib/check-config.sh" from upstream's sources |
102 |
-CONFIG_CHECK=" |
103 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
104 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
105 |
- ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
106 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE |
107 |
- ~IP_VS ~IP_VS_RR |
108 |
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
109 |
- ~NETFILTER_XT_MATCH_IPVS |
110 |
- ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT |
111 |
- ~NF_NAT ~NF_NAT_NEEDED |
112 |
- |
113 |
- ~POSIX_MQUEUE |
114 |
- |
115 |
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
116 |
- |
117 |
- ~BLK_CGROUP ~IOSCHED_CFQ |
118 |
- ~CGROUP_PERF |
119 |
- ~CGROUP_HUGETLB |
120 |
- ~NET_CLS_CGROUP |
121 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
122 |
- ~XFRM_ALGO ~XFRM_USER |
123 |
-" |
124 |
- |
125 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory" |
126 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
127 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
128 |
- |
129 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
130 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
131 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
132 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
133 |
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" |
134 |
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" |
135 |
- |
136 |
-pkg_setup() { |
137 |
- if kernel_is lt 3 10; then |
138 |
- ewarn "" |
139 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
140 |
- ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies" |
141 |
- fi |
142 |
- |
143 |
- # for where these kernel versions come from, see: |
144 |
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* |
145 |
- if ! { |
146 |
- kernel_is ge 3 16 \ |
147 |
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ |
148 |
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ |
149 |
- || { kernel_is 3 12 && kernel_is ge 3 12 25; } |
150 |
- }; then |
151 |
- ewarn "" |
152 |
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" |
153 |
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" |
154 |
- ewarn "" |
155 |
- ewarn "See also https://github.com/docker/docker/issues/2960" |
156 |
- fi |
157 |
- |
158 |
- if kernel_is le 3 18; then |
159 |
- CONFIG_CHECK+=" |
160 |
- ~RESOURCE_COUNTERS |
161 |
- " |
162 |
- fi |
163 |
- |
164 |
- if kernel_is le 3 13; then |
165 |
- CONFIG_CHECK+=" |
166 |
- ~NETPRIO_CGROUP |
167 |
- " |
168 |
- else |
169 |
- CONFIG_CHECK+=" |
170 |
- ~CGROUP_NET_PRIO |
171 |
- " |
172 |
- fi |
173 |
- |
174 |
- if kernel_is lt 4 5; then |
175 |
- CONFIG_CHECK+=" |
176 |
- ~MEMCG_KMEM |
177 |
- " |
178 |
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
179 |
- fi |
180 |
- |
181 |
- if kernel_is lt 4 7; then |
182 |
- CONFIG_CHECK+=" |
183 |
- ~DEVPTS_MULTIPLE_INSTANCES |
184 |
- " |
185 |
- fi |
186 |
- |
187 |
- if use aufs; then |
188 |
- CONFIG_CHECK+=" |
189 |
- ~AUFS_FS |
190 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
191 |
- " |
192 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" |
193 |
- fi |
194 |
- |
195 |
- if use btrfs; then |
196 |
- CONFIG_CHECK+=" |
197 |
- ~BTRFS_FS |
198 |
- " |
199 |
- fi |
200 |
- |
201 |
- if use device-mapper; then |
202 |
- CONFIG_CHECK+=" |
203 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
204 |
- " |
205 |
- fi |
206 |
- |
207 |
- if use overlay; then |
208 |
- CONFIG_CHECK+=" |
209 |
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL |
210 |
- " |
211 |
- fi |
212 |
- |
213 |
- linux-info_pkg_setup |
214 |
- |
215 |
- # create docker group for the code checking for it in /etc/group |
216 |
- enewgroup docker |
217 |
-} |
218 |
- |
219 |
-src_compile() { |
220 |
- export GOPATH="${WORKDIR}/${P}:${PWD}/vendor" |
221 |
- |
222 |
- # setup CFLAGS and LDFLAGS for separate build target |
223 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
224 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
225 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
226 |
- |
227 |
- # if we're building from a zip, we need the GITCOMMIT value |
228 |
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |
229 |
- |
230 |
- if gcc-specs-pie; then |
231 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
232 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
233 |
- |
234 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
235 |
- -i hack/make/dynbinary-client || die |
236 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
237 |
- -i hack/make/dynbinary-daemon || die |
238 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' |
239 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' |
240 |
- fi |
241 |
- |
242 |
- # let's set up some optional features :) |
243 |
- export DOCKER_BUILDTAGS='' |
244 |
- for gd in aufs btrfs device-mapper overlay; do |
245 |
- if ! use $gd; then |
246 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
247 |
- fi |
248 |
- done |
249 |
- |
250 |
- for tag in apparmor seccomp; do |
251 |
- if use $tag; then |
252 |
- DOCKER_BUILDTAGS+=" $tag" |
253 |
- fi |
254 |
- done |
255 |
- |
256 |
- # https://github.com/docker/docker/pull/13338 |
257 |
- if use experimental; then |
258 |
- export DOCKER_EXPERIMENTAL=1 |
259 |
- else |
260 |
- unset DOCKER_EXPERIMENTAL |
261 |
- fi |
262 |
- |
263 |
- # time to build! |
264 |
- ./hack/make.sh dynbinary || die 'dynbinary failed' |
265 |
- |
266 |
- # build the man pages too |
267 |
- ./man/md2man-all.sh || die "unable to generate man pages" |
268 |
-} |
269 |
- |
270 |
-src_install() { |
271 |
- VERSION="$(cat VERSION)" |
272 |
- newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker |
273 |
- newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd |
274 |
- newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy |
275 |
- dosym containerd /usr/bin/docker-containerd |
276 |
- dosym containerd-shim /usr/bin/docker-containerd-shim |
277 |
- dosym runc /usr/bin/docker-runc |
278 |
- |
279 |
- newinitd contrib/init/openrc/docker.initd docker |
280 |
- newconfd contrib/init/openrc/docker.confd docker |
281 |
- |
282 |
- systemd_dounit contrib/init/systemd/docker.{service,socket} |
283 |
- |
284 |
- udev_dorules contrib/udev/*.rules |
285 |
- |
286 |
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
287 |
- dodoc -r docs/* |
288 |
- doman man/man*/* |
289 |
- |
290 |
- dobashcomp contrib/completion/bash/* |
291 |
- |
292 |
- insinto /usr/share/zsh/site-functions |
293 |
- doins contrib/completion/zsh/* |
294 |
- |
295 |
- insinto /usr/share/vim/vimfiles |
296 |
- doins -r contrib/syntax/vim/ftdetect |
297 |
- doins -r contrib/syntax/vim/syntax |
298 |
- |
299 |
- # note: intentionally not using "doins" so that we preserve +x bits |
300 |
- mkdir -p "${D}/usr/share/${PN}/contrib" |
301 |
- cp -R contrib/* "${D}/usr/share/${PN}/contrib" |
302 |
-} |
303 |
- |
304 |
-pkg_postinst() { |
305 |
- udev_reload |
306 |
- |
307 |
- elog |
308 |
- elog "To use Docker, the Docker daemon must be running as root. To automatically" |
309 |
- elog "start the Docker daemon at boot, add Docker to the default runlevel:" |
310 |
- elog " rc-update add docker default" |
311 |
- elog "Similarly for systemd:" |
312 |
- elog " systemctl enable docker.service" |
313 |
- elog |
314 |
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:" |
315 |
- elog " usermod -aG docker youruser" |
316 |
- elog |
317 |
-} |