From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B93D01382C5 for ; Fri, 8 Jan 2021 18:14:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2608E086C; Fri, 8 Jan 2021 18:14:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A0C2E086C for ; Fri, 8 Jan 2021 18:14:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79987340D40 for ; Fri, 8 Jan 2021 18:14:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC8BE53 for ; Fri, 8 Jan 2021 18:14:26 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1610129589.8a2bc214ed5a9607bd2e19178af4782b0965b34b.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-20.10.2.ebuild app-emulation/docker/metadata.xml X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8a2bc214ed5a9607bd2e19178af4782b0965b34b X-VCS-Branch: master Date: Fri, 8 Jan 2021 18:14:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e15aedd-4101-47de-9a82-7659d78de54c X-Archives-Hash: cd71c485e08a65c51f941761a082a5c3 commit: 8a2bc214ed5a9607bd2e19178af4782b0965b34b Author: William Hubbs gentoo org> AuthorDate: Fri Jan 8 18:12:32 2021 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Jan 8 18:13:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2bc214 app-emulation/docker-cli: 20.10.2 qa-requested changes - unpin the docker-cli version - use the "cli" global use flag for the command line interface but note it is being used temporarily. Signed-off-by: William Hubbs gentoo.org> app-emulation/docker/docker-20.10.2.ebuild | 11 +++++------ app-emulation/docker/metadata.xml | 12 ++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app-emulation/docker/docker-20.10.2.ebuild b/app-emulation/docker/docker-20.10.2.ebuild index fc76d42b04c..7853e583ce8 100644 --- a/app-emulation/docker/docker-20.10.2.ebuild +++ b/app-emulation/docker/docker-20.10.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp +temp-cli" +IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" DEPEND=" acct-group/docker @@ -40,8 +40,8 @@ RDEPEND=" ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20201211 + cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] ) - temp-cli? ( ~app-emulation/docker-cli-${PV} ) " # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies @@ -270,20 +270,19 @@ pkg_postinst() { elog fi - if use temp-cli; then + if use cli; then ewarn "Starting with docker 20.10.2, docker has been split into" ewarn "two packages upstream, so Gentoo has followed suit." ewarn ewarn "app-emulation/docker contains the daemon and" ewarn "app-emulation/docker-cli contains the docker command." ewarn - ewarn "docker currently installs docker-cli using the temp-cli" - ewarn "use flag." + ewarn "docker currently installs docker-cli using the cli use flag." ewarn ewarn "This use flag is temporary, so you need to take the" ewarn "following actions:" ewarn - ewarn "First, disable the temp-cli use flag for app-emulation/docker" + ewarn "First, disable the cli use flag for app-emulation/docker" ewarn ewarn "Then, if you need docker-cli and docker on the same machine," ewarn "run the following command:" diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml index 93b6a7a3098..1ec7d353074 100644 --- a/app-emulation/docker/metadata.xml +++ b/app-emulation/docker/metadata.xml @@ -27,6 +27,12 @@ Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. + + + This is a temporary use flag which pulls in + app-emulation/docker-cli, the docker command line client. + This flag is here to assist in the transition to split packages + and will be removed in a future release. Makes the a staticly-linked init system tini available inside a @@ -40,12 +46,6 @@ Enables dependencies for the "overlay" graph driver, including necessary kernel flags. - - This is a temporary use flag which pulls in - app-emulation/docker-cli, the docker command line client. - This flag is here to assist in the transition to split packages - and will be removed in a future release. - moby/moby