commit: 2e72dffe22381a25a74e7ac7e4cb5e769bd0d38a Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Wed Sep 23 23:28:50 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Sep 24 00:01:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e72dffe
app-emulation/docker: revbump, pin correct deps containerd,docker-proxy,runc and tini should be pinned to exact versions https://github.com/docker/docker-ce/tree/19.03/components/engine/hack/dockerfile/install Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> .../{docker-19.03.13-r1.ebuild => docker-19.03.13-r2.ebuild} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app-emulation/docker/docker-19.03.13-r1.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild similarity index 95% rename from app-emulation/docker/docker-19.03.13-r1.ebuild rename to app-emulation/docker/docker-19.03.13-r2.ebuild index f00a011e854..466ac242d03 100644 --- a/app-emulation/docker/docker-19.03.13-r1.ebuild +++ b/app-emulation/docker/docker-19.03.13-r2.ebuild @@ -44,7 +44,9 @@ DEPEND=" # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -# also look at components/*/vendor.conf for exact version of ~pinned dependencies +# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install +# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# for appropriate brachch/version of course RDEPEND=" ${DEPEND} !sys-apps/systemd[-cgroup-hybrid(+)] @@ -53,9 +55,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - ~app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] - ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux?] - ~app-emulation/docker-proxy-0.8.0_p20191011 + ~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] + ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] + ~app-emulation/docker-proxy-0.8.0_p20200617 container-init? ( >=sys-process/tini-0.18.0[static] ) " @@ -254,7 +256,7 @@ src_compile() { src_install() { dosym containerd /usr/bin/docker-containerd dosym containerd-shim /usr/bin/docker-containerd-shim - dosym ../sbin/runc /usr/bin/docker-runc + dosym runc /usr/bin/docker-runc use container-init && dosym tini /usr/bin/docker-init pushd components/engine || die
