1 |
commit: 29e977ed0c21682403432b16e82befc6d84516ad |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 8 19:23:18 2021 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 8 19:28:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e977ed |
7 |
|
8 |
app-emulation/docker: remove 20.10.1 |
9 |
|
10 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
11 |
|
12 |
app-emulation/docker/Manifest | 1 - |
13 |
app-emulation/docker/docker-20.10.1.ebuild | 286 ----------------------------- |
14 |
2 files changed, 287 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest |
17 |
index 846dc1dd1b5..66b41a5b124 100644 |
18 |
--- a/app-emulation/docker/Manifest |
19 |
+++ b/app-emulation/docker/Manifest |
20 |
@@ -1,4 +1,3 @@ |
21 |
DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873 |
22 |
DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28 |
23 |
-DIST docker-20.10.1.tar.gz 11042081 BLAKE2B 98fec753f0695983d197993291a4fd0f3c94e3e3bfe548977df6659c9458109fa35edc9cf2cdd94e2277250672b9a265b50b35bd52228665f7dddf6875a24604 SHA512 5e32a46dab5b527839594e48b715495a77aa9c9e0c7e427eb227409c20c3af0d95a731080048ee20b7c68288bd77e32458bf30c658406d8585ccf8d33e7b79e3 |
24 |
DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56 |
25 |
|
26 |
diff --git a/app-emulation/docker/docker-20.10.1.ebuild b/app-emulation/docker/docker-20.10.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index f7fa1a56f93..00000000000 |
29 |
--- a/app-emulation/docker/docker-20.10.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,286 +0,0 @@ |
32 |
-# Copyright 1999-2020 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
-EGO_PN="github.com/docker/docker" |
37 |
-GIT_COMMIT=f0014860c1 |
38 |
-inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot |
39 |
- |
40 |
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers" |
41 |
-HOMEPAGE="https://www.docker.com/" |
42 |
-MY_PV=${PV/_/-} |
43 |
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
48 |
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux" |
49 |
- |
50 |
-DEPEND=" |
51 |
- acct-group/docker |
52 |
- >=dev-db/sqlite-3.7.9:3 |
53 |
- apparmor? ( sys-libs/libapparmor ) |
54 |
- btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) |
55 |
- device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) |
56 |
- seccomp? ( >=sys-libs/libseccomp-2.2.1 ) |
57 |
-" |
58 |
- |
59 |
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies |
60 |
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies |
61 |
-# https://github.com/moby/moby/tree/master//hack/dockerfile/install |
62 |
-# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, |
63 |
-# for appropriate branchch/version of course |
64 |
-RDEPEND=" |
65 |
- ${DEPEND} |
66 |
- >=net-firewall/iptables-1.4 |
67 |
- sys-process/procps |
68 |
- >=dev-vcs/git-1.7 |
69 |
- >=app-arch/xz-utils-4.9 |
70 |
- dev-libs/libltdl |
71 |
- ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] |
72 |
- ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux(-)?] |
73 |
- ~app-emulation/docker-proxy-0.8.0_p20201211 |
74 |
- container-init? ( >=sys-process/tini-0.19.0[static] ) |
75 |
-" |
76 |
- |
77 |
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies |
78 |
-BDEPEND=" |
79 |
- >=dev-lang/go-1.13.12 |
80 |
- dev-go/go-md2man |
81 |
- virtual/pkgconfig |
82 |
-" |
83 |
- |
84 |
-RESTRICT="installsources strip" |
85 |
- |
86 |
-S="${WORKDIR}/${P}/src/${EGO_PN}" |
87 |
- |
88 |
-# see "contrib/check-config.sh" from upstream's sources |
89 |
-CONFIG_CHECK=" |
90 |
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
91 |
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
92 |
- ~KEYS |
93 |
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
94 |
- ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
95 |
- ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS |
96 |
- ~IP_NF_NAT ~NF_NAT |
97 |
- ~POSIX_MQUEUE |
98 |
- |
99 |
- ~USER_NS |
100 |
- ~SECCOMP |
101 |
- ~CGROUP_PIDS |
102 |
- ~MEMCG_SWAP |
103 |
- |
104 |
- ~BLK_CGROUP ~BLK_DEV_THROTTLING |
105 |
- ~CGROUP_PERF |
106 |
- ~CGROUP_HUGETLB |
107 |
- ~NET_CLS_CGROUP |
108 |
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED |
109 |
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR |
110 |
- |
111 |
- ~VXLAN |
112 |
- ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER |
113 |
- ~IPVLAN |
114 |
- ~MACVLAN ~DUMMY |
115 |
- |
116 |
- ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR |
117 |
- ~EXT4_FS_SECURITY |
118 |
- ~EXT4_FS_POSIX_ACL |
119 |
-" |
120 |
- |
121 |
-ERROR_KEYS="CONFIG_KEYS: is mandatory" |
122 |
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
123 |
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
124 |
- |
125 |
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" |
126 |
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" |
127 |
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" |
128 |
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" |
129 |
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" |
130 |
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" |
131 |
- |
132 |
-pkg_setup() { |
133 |
- if kernel_is lt 3 10; then |
134 |
- ewarn "" |
135 |
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." |
136 |
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" |
137 |
- fi |
138 |
- |
139 |
- if kernel_is le 3 18; then |
140 |
- CONFIG_CHECK+=" |
141 |
- ~RESOURCE_COUNTERS |
142 |
- " |
143 |
- fi |
144 |
- |
145 |
- if kernel_is le 3 13; then |
146 |
- CONFIG_CHECK+=" |
147 |
- ~NETPRIO_CGROUP |
148 |
- " |
149 |
- else |
150 |
- CONFIG_CHECK+=" |
151 |
- ~CGROUP_NET_PRIO |
152 |
- " |
153 |
- fi |
154 |
- |
155 |
- if kernel_is lt 4 5; then |
156 |
- CONFIG_CHECK+=" |
157 |
- ~MEMCG_KMEM |
158 |
- " |
159 |
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
160 |
- fi |
161 |
- |
162 |
- if kernel_is lt 4 7; then |
163 |
- CONFIG_CHECK+=" |
164 |
- ~DEVPTS_MULTIPLE_INSTANCES |
165 |
- " |
166 |
- fi |
167 |
- |
168 |
- if kernel_is lt 5 1; then |
169 |
- CONFIG_CHECK+=" |
170 |
- ~NF_NAT_IPV4 |
171 |
- ~IOSCHED_CFQ |
172 |
- ~CFQ_GROUP_IOSCHED |
173 |
- " |
174 |
- fi |
175 |
- |
176 |
- if kernel_is lt 5 2; then |
177 |
- CONFIG_CHECK+=" |
178 |
- ~NF_NAT_NEEDED |
179 |
- " |
180 |
- fi |
181 |
- |
182 |
- if kernel_is lt 5 8; then |
183 |
- CONFIG_CHECK+=" |
184 |
- ~MEMCG_SWAP_ENABLED |
185 |
- " |
186 |
- fi |
187 |
- |
188 |
- if use aufs; then |
189 |
- CONFIG_CHECK+=" |
190 |
- ~AUFS_FS |
191 |
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
192 |
- " |
193 |
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" |
194 |
- fi |
195 |
- |
196 |
- if use btrfs; then |
197 |
- CONFIG_CHECK+=" |
198 |
- ~BTRFS_FS |
199 |
- ~BTRFS_FS_POSIX_ACL |
200 |
- " |
201 |
- fi |
202 |
- |
203 |
- if use device-mapper; then |
204 |
- CONFIG_CHECK+=" |
205 |
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY |
206 |
- " |
207 |
- fi |
208 |
- |
209 |
- linux-info_pkg_setup |
210 |
-} |
211 |
- |
212 |
-src_compile() { |
213 |
- export DOCKER_GITCOMMIT="${GIT_COMMIT}" |
214 |
- export GOPATH="${WORKDIR}/${P}" |
215 |
- |
216 |
- # setup CFLAGS and LDFLAGS for separate build target |
217 |
- # see https://github.com/tianon/docker-overlay/pull/10 |
218 |
- export CGO_CFLAGS="-I${ROOT}/usr/include" |
219 |
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" |
220 |
- |
221 |
- # let's set up some optional features :) |
222 |
- export DOCKER_BUILDTAGS='' |
223 |
- for gd in aufs btrfs device-mapper overlay; do |
224 |
- if ! use $gd; then |
225 |
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" |
226 |
- fi |
227 |
- done |
228 |
- |
229 |
- for tag in apparmor seccomp selinux; do |
230 |
- if use $tag; then |
231 |
- DOCKER_BUILDTAGS+=" $tag" |
232 |
- fi |
233 |
- done |
234 |
- |
235 |
- if use hardened; then |
236 |
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die |
237 |
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
238 |
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
239 |
- -i hack/make/dynbinary-daemon || die |
240 |
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' |
241 |
- fi |
242 |
- |
243 |
- # build daemon |
244 |
- ./hack/make.sh dynbinary || die 'dynbinary failed' |
245 |
-} |
246 |
- |
247 |
-src_install() { |
248 |
- dosym containerd /usr/bin/docker-containerd |
249 |
- dosym containerd-shim /usr/bin/docker-containerd-shim |
250 |
- dosym runc /usr/bin/docker-runc |
251 |
- use container-init && dosym tini /usr/bin/docker-init |
252 |
- newbin bundles/dynbinary-daemon/dockerd dockerd |
253 |
- |
254 |
- newinitd contrib/init/openrc/docker.initd docker |
255 |
- newconfd contrib/init/openrc/docker.confd docker |
256 |
- |
257 |
- systemd_dounit contrib/init/systemd/docker.{service,socket} |
258 |
- |
259 |
- udev_dorules contrib/udev/*.rules |
260 |
- |
261 |
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md |
262 |
- dodoc -r docs/* |
263 |
- |
264 |
- # note: intentionally not using "doins" so that we preserve +x bits |
265 |
- dodir /usr/share/${PN}/contrib |
266 |
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib" |
267 |
-} |
268 |
- |
269 |
-splitting_docker_cli() { |
270 |
- local v |
271 |
- for v in ${REPLACING_VERSIONS}; do |
272 |
- ver_test ${v} -lt 20.10.1 && return 0 |
273 |
- done |
274 |
- return 1 |
275 |
-} |
276 |
- |
277 |
-pkg_postinst() { |
278 |
- udev_reload |
279 |
- |
280 |
- elog |
281 |
- elog "To use Docker, the Docker daemon must be running as root. To automatically" |
282 |
- elog "start the Docker daemon at boot:" |
283 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
284 |
- elog " systemctl enable docker.service" |
285 |
- else |
286 |
- elog " rc-update add docker default" |
287 |
- fi |
288 |
- elog |
289 |
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:" |
290 |
- elog ' usermod -aG docker <youruser>' |
291 |
- elog |
292 |
- |
293 |
- if use device-mapper; then |
294 |
- elog " Devicemapper storage driver has been deprecated" |
295 |
- elog " It will be removed in a future release" |
296 |
- elog |
297 |
- fi |
298 |
- |
299 |
- if use overlay; then |
300 |
- elog " Overlay storage driver/USEflag has been deprecated" |
301 |
- elog " in favor of overlay2 (enabled unconditionally)" |
302 |
- elog |
303 |
- fi |
304 |
- |
305 |
- if has_version sys-fs/zfs; then |
306 |
- elog " ZFS storage driver is available" |
307 |
- elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" |
308 |
- elog |
309 |
- fi |
310 |
- |
311 |
- if splitting_docker_cli; then |
312 |
- ewarn "Starting with docker 20.10.1, docker has been split into" |
313 |
- ewarn "two packages upstream, so Gentoo has followed suit." |
314 |
- ewarn "app-emulation/docker contains the daemon and" |
315 |
- ewarn "app-emulation/docker-cli contains the docker command." |
316 |
- fi |
317 |
-} |