| 1 |
commit: 8a2bc214ed5a9607bd2e19178af4782b0965b34b |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 8 18:12:32 2021 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 8 18:13:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2bc214 |
| 7 |
|
| 8 |
app-emulation/docker-cli: 20.10.2 qa-requested changes |
| 9 |
|
| 10 |
- unpin the docker-cli version |
| 11 |
- use the "cli" global use flag for the command line interface but note |
| 12 |
it is being used temporarily. |
| 13 |
|
| 14 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/docker/docker-20.10.2.ebuild | 11 +++++------ |
| 17 |
app-emulation/docker/metadata.xml | 12 ++++++------ |
| 18 |
2 files changed, 11 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-emulation/docker/docker-20.10.2.ebuild b/app-emulation/docker/docker-20.10.2.ebuild |
| 21 |
index fc76d42b04c..7853e583ce8 100644 |
| 22 |
--- a/app-emulation/docker/docker-20.10.2.ebuild |
| 23 |
+++ b/app-emulation/docker/docker-20.10.2.ebuild |
| 24 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
| 25 |
LICENSE="Apache-2.0" |
| 26 |
SLOT="0" |
| 27 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 28 |
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp +temp-cli" |
| 29 |
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" |
| 30 |
|
| 31 |
DEPEND=" |
| 32 |
acct-group/docker |
| 33 |
@@ -40,8 +40,8 @@ RDEPEND=" |
| 34 |
~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] |
| 35 |
~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?] |
| 36 |
~app-emulation/docker-proxy-0.8.0_p20201211 |
| 37 |
+ cli? ( app-emulation/docker-cli ) |
| 38 |
container-init? ( >=sys-process/tini-0.19.0[static] ) |
| 39 |
- temp-cli? ( ~app-emulation/docker-cli-${PV} ) |
| 40 |
" |
| 41 |
|
| 42 |
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies |
| 43 |
@@ -270,20 +270,19 @@ pkg_postinst() { |
| 44 |
elog |
| 45 |
fi |
| 46 |
|
| 47 |
- if use temp-cli; then |
| 48 |
+ if use cli; then |
| 49 |
ewarn "Starting with docker 20.10.2, docker has been split into" |
| 50 |
ewarn "two packages upstream, so Gentoo has followed suit." |
| 51 |
ewarn |
| 52 |
ewarn "app-emulation/docker contains the daemon and" |
| 53 |
ewarn "app-emulation/docker-cli contains the docker command." |
| 54 |
ewarn |
| 55 |
- ewarn "docker currently installs docker-cli using the temp-cli" |
| 56 |
- ewarn "use flag." |
| 57 |
+ ewarn "docker currently installs docker-cli using the cli use flag." |
| 58 |
ewarn |
| 59 |
ewarn "This use flag is temporary, so you need to take the" |
| 60 |
ewarn "following actions:" |
| 61 |
ewarn |
| 62 |
- ewarn "First, disable the temp-cli use flag for app-emulation/docker" |
| 63 |
+ ewarn "First, disable the cli use flag for app-emulation/docker" |
| 64 |
ewarn |
| 65 |
ewarn "Then, if you need docker-cli and docker on the same machine," |
| 66 |
ewarn "run the following command:" |
| 67 |
|
| 68 |
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml |
| 69 |
index 93b6a7a3098..1ec7d353074 100644 |
| 70 |
--- a/app-emulation/docker/metadata.xml |
| 71 |
+++ b/app-emulation/docker/metadata.xml |
| 72 |
@@ -27,6 +27,12 @@ |
| 73 |
<flag name="btrfs"> |
| 74 |
Enables dependencies for the "btrfs" graph driver, including |
| 75 |
necessary kernel flags. |
| 76 |
+ </flag> |
| 77 |
+ <flag name="cli"> |
| 78 |
+ This is a temporary use flag which pulls in |
| 79 |
+ app-emulation/docker-cli, the docker command line client. |
| 80 |
+ This flag is here to assist in the transition to split packages |
| 81 |
+ and will be removed in a future release. |
| 82 |
</flag> |
| 83 |
<flag name="container-init"> |
| 84 |
Makes the a staticly-linked init system tini available inside a |
| 85 |
@@ -40,12 +46,6 @@ |
| 86 |
Enables dependencies for the "overlay" graph driver, including |
| 87 |
necessary kernel flags. |
| 88 |
</flag> |
| 89 |
- <flag name="temp-cli"> |
| 90 |
- This is a temporary use flag which pulls in |
| 91 |
- app-emulation/docker-cli, the docker command line client. |
| 92 |
- This flag is here to assist in the transition to split packages |
| 93 |
- and will be removed in a future release. |
| 94 |
- </flag> |
| 95 |
</use> |
| 96 |
<upstream> |
| 97 |
<remote-id type="github">moby/moby</remote-id> |
Archives