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