Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/
Date: Mon, 29 Jul 2019 09:07:45
Message-Id: 1564391215.1cbd2f3a462f7aba9175f21cadaf60b8fa4cd9e6.mrueg@gentoo
1 commit: 1cbd2f3a462f7aba9175f21cadaf60b8fa4cd9e6
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 29 09:06:55 2019 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 29 09:06:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbd2f3a
7
8 app-emulation/docker: Remove old
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>
12
13 app-emulation/docker/Manifest | 1 -
14 app-emulation/docker/docker-18.09.7.ebuild | 300 -----------------------------
15 2 files changed, 301 deletions(-)
16
17 diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
18 index 6636246a197..9ec7b69503d 100644
19 --- a/app-emulation/docker/Manifest
20 +++ b/app-emulation/docker/Manifest
21 @@ -1,2 +1 @@
22 -DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64 SHA512 7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
23 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4 SHA512 34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
24
25 diff --git a/app-emulation/docker/docker-18.09.7.ebuild b/app-emulation/docker/docker-18.09.7.ebuild
26 deleted file mode 100644
27 index e466c07b7c1..00000000000
28 --- a/app-emulation/docker/docker-18.09.7.ebuild
29 +++ /dev/null
30 @@ -1,300 +0,0 @@
31 -# Copyright 1999-2019 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -EGO_PN="github.com/docker/docker-ce"
37 -
38 -if [[ ${PV} = *9999* ]]; then
39 - # Docker cannot be fetched via "go get", thanks to autogenerated code
40 - EGIT_REPO_URI="https://${EGO_PN}.git"
41 - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
42 - inherit git-r3
43 -else
44 - DOCKER_GITCOMMIT="2d0083d"
45 - MY_PV=${PV/_/-}
46 - SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
47 - KEYWORDS="amd64 ~arm ~arm64"
48 - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
49 - inherit golang-vcs-snapshot
50 -fi
51 -inherit bash-completion-r1 golang-base linux-info systemd udev user
52 -
53 -DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
54 -HOMEPAGE="https://dockerproject.org"
55 -LICENSE="Apache-2.0"
56 -SLOT="0"
57 -IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
58 -
59 -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
60 -CDEPEND="
61 - >=dev-db/sqlite-3.7.9:3
62 - device-mapper? (
63 - >=sys-fs/lvm2-2.02.89[thin]
64 - )
65 - seccomp? ( >=sys-libs/libseccomp-2.2.1 )
66 - apparmor? ( sys-libs/libapparmor )
67 -"
68 -
69 -DEPEND="
70 - ${CDEPEND}
71 -
72 - dev-go/go-md2man
73 -
74 - btrfs? (
75 - >=sys-fs/btrfs-progs-3.16.1
76 - )
77 -"
78 -
79 -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
80 -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
81 -RDEPEND="
82 - ${CDEPEND}
83 - >=net-firewall/iptables-1.4
84 - sys-process/procps
85 - >=dev-vcs/git-1.7
86 - >=app-arch/xz-utils-4.9
87 - dev-libs/libltdl
88 - ~app-emulation/containerd-1.2.6
89 - ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
90 - ~app-emulation/docker-proxy-0.8.0_p20190513
91 - container-init? ( >=sys-process/tini-0.18.0[static] )
92 -"
93 -
94 -RESTRICT="installsources strip"
95 -
96 -S="${WORKDIR}/${P}/src/${EGO_PN}"
97 -
98 -# see "contrib/check-config.sh" from upstream's sources
99 -CONFIG_CHECK="
100 - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
101 - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
102 - ~KEYS
103 - ~VETH ~BRIDGE ~BRIDGE_NETFILTER
104 - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
105 - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
106 - ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
107 - ~POSIX_MQUEUE
108 -
109 - ~USER_NS
110 - ~SECCOMP
111 - ~CGROUP_PIDS
112 - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
113 -
114 - ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
115 - ~CGROUP_PERF
116 - ~CGROUP_HUGETLB
117 - ~NET_CLS_CGROUP
118 - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
119 - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
120 -
121 - ~VXLAN
122 - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
123 - ~IPVLAN
124 - ~MACVLAN ~DUMMY
125 -"
126 -
127 -ERROR_KEYS="CONFIG_KEYS: is mandatory"
128 -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
129 -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
130 -
131 -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
132 -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
133 -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
134 -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
135 -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
136 -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
137 -
138 -pkg_setup() {
139 - if kernel_is lt 3 10; then
140 - ewarn ""
141 - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
142 - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
143 - fi
144 -
145 - if kernel_is le 3 18; then
146 - CONFIG_CHECK+="
147 - ~RESOURCE_COUNTERS
148 - "
149 - fi
150 -
151 - if kernel_is le 3 13; then
152 - CONFIG_CHECK+="
153 - ~NETPRIO_CGROUP
154 - "
155 - else
156 - CONFIG_CHECK+="
157 - ~CGROUP_NET_PRIO
158 - "
159 - fi
160 -
161 - if kernel_is lt 4 5; then
162 - CONFIG_CHECK+="
163 - ~MEMCG_KMEM
164 - "
165 - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
166 - fi
167 -
168 - if kernel_is lt 4 7; then
169 - CONFIG_CHECK+="
170 - ~DEVPTS_MULTIPLE_INSTANCES
171 - "
172 - fi
173 -
174 - if use aufs; then
175 - CONFIG_CHECK+="
176 - ~AUFS_FS
177 - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
178 - "
179 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
180 - fi
181 -
182 - if use btrfs; then
183 - CONFIG_CHECK+="
184 - ~BTRFS_FS
185 - ~BTRFS_FS_POSIX_ACL
186 - "
187 - fi
188 -
189 - if use device-mapper; then
190 - CONFIG_CHECK+="
191 - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
192 - "
193 - fi
194 -
195 - if use overlay; then
196 - CONFIG_CHECK+="
197 - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
198 - "
199 - fi
200 -
201 - linux-info_pkg_setup
202 -
203 - # create docker group for the code checking for it in /etc/group
204 - enewgroup docker
205 -}
206 -
207 -src_compile() {
208 - export GOPATH="${WORKDIR}/${P}"
209 -
210 - # setup CFLAGS and LDFLAGS for separate build target
211 - # see https://github.com/tianon/docker-overlay/pull/10
212 - export CGO_CFLAGS="-I${ROOT}/usr/include"
213 - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
214 -
215 - # if we're building from a tarball, we need the GITCOMMIT value
216 - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
217 -
218 - # fake golang layout
219 - ln -s docker-ce/components/engine ../docker || die
220 - ln -s docker-ce/components/cli ../cli || die
221 -
222 - # let's set up some optional features :)
223 - export DOCKER_BUILDTAGS=''
224 - for gd in aufs btrfs device-mapper overlay; do
225 - if ! use $gd; then
226 - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
227 - fi
228 - done
229 -
230 - for tag in apparmor seccomp; do
231 - if use $tag; then
232 - DOCKER_BUILDTAGS+=" $tag"
233 - fi
234 - done
235 -
236 - pushd components/engine || die
237 -
238 - if use hardened; then
239 - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
240 - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
241 - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
242 - -i hack/make/dynbinary-daemon || die
243 - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
244 - fi
245 -
246 - # build daemon
247 - VERSION="$(cat ../../VERSION)" \
248 - ./hack/make.sh dynbinary || die 'dynbinary failed'
249 -
250 - popd || die # components/engine
251 -
252 - pushd components/cli || die
253 -
254 - # build cli
255 - emake \
256 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
257 - VERSION="$(cat ../../VERSION)" \
258 - GITCOMMIT="${DOCKER_GITCOMMIT}" \
259 - DISABLE_WARN_OUTSIDE_CONTAINER=1 \
260 - dynbinary || die
261 -
262 - # build man pages
263 - go build -o gen-manpages github.com/docker/cli/man || die
264 - ./gen-manpages --root . --target ./man/man1 || die
265 - ./man/md2man-all.sh -q || die
266 - rm gen-manpages || die
267 - # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
268 -
269 - popd || die # components/cli
270 -}
271 -
272 -src_install() {
273 - dosym containerd /usr/bin/docker-containerd
274 - dosym containerd-shim /usr/bin/docker-containerd-shim
275 - dosym runc /usr/bin/docker-runc
276 - use container-init && dosym tini /usr/bin/docker-init
277 -
278 - pushd components/engine || die
279 - newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
280 -
281 - newinitd contrib/init/openrc/docker.initd docker
282 - newconfd contrib/init/openrc/docker.confd docker
283 -
284 - systemd_dounit contrib/init/systemd/docker.{service,socket}
285 -
286 - udev_dorules contrib/udev/*.rules
287 -
288 - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
289 - dodoc -r docs/*
290 -
291 - insinto /usr/share/vim/vimfiles
292 - doins -r contrib/syntax/vim/ftdetect
293 - doins -r contrib/syntax/vim/syntax
294 -
295 - # note: intentionally not using "doins" so that we preserve +x bits
296 - dodir /usr/share/${PN}/contrib
297 - cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
298 - popd || die # components/engine
299 -
300 - pushd components/cli || die
301 -
302 - newbin build/docker-* docker
303 -
304 - doman man/man*/*
305 -
306 - dobashcomp contrib/completion/bash/*
307 - insinto /usr/share/fish/vendor_completions.d/
308 - doins contrib/completion/fish/docker.fish
309 - insinto /usr/share/zsh/site-functions
310 - doins contrib/completion/zsh/_*
311 - popd || die # components/cli
312 -}
313 -
314 -pkg_postinst() {
315 - udev_reload
316 -
317 - elog
318 - elog "To use Docker, the Docker daemon must be running as root. To automatically"
319 - elog "start the Docker daemon at boot, add Docker to the default runlevel:"
320 - elog " rc-update add docker default"
321 - elog "Similarly for systemd:"
322 - elog " systemctl enable docker.service"
323 - elog
324 - elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
325 - elog " usermod -aG docker youruser"
326 - elog
327 -
328 - elog " Devicemapper storage driver has been deprecated"
329 - elog " It will be removed in a future release"
330 -}