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 443E3138359 for ; Wed, 23 Sep 2020 00:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47B57E0848; Wed, 23 Sep 2020 00:46:18 +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 2B5B9E0848 for ; Wed, 23 Sep 2020 00:46:18 +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 CD202340A15 for ; Wed, 23 Sep 2020 00:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A2672EC for ; Wed, 23 Sep 2020 00:46:15 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1600821907.ac37ed8532c005c8b940650a46abfc9339f7655e.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-19.03.13.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: ac37ed8532c005c8b940650a46abfc9339f7655e X-VCS-Branch: master Date: Wed, 23 Sep 2020 00:46:15 +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: a1b75619-3f3d-468a-ae7f-80a92d319c99 X-Archives-Hash: 9cee8c220fe775f1c59e46816441a730 commit: ac37ed8532c005c8b940650a46abfc9339f7655e Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Sep 23 00:45:07 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Sep 23 00:45:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac37ed85 app-emulation/docker: don't enable obsolete overlay driver by default overlay2 is preferred over it. overlay2 is built unconditionally and is default storage graph driver. https://docs.docker.com/storage/storagedriver/overlayfs-driver/ Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/docker/docker-19.03.13.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app-emulation/docker/docker-19.03.13.ebuild b/app-emulation/docker/docker-19.03.13.ebuild index dad2dd92986..e1df62c680d 100644 --- a/app-emulation/docker/docker-19.03.13.ebuild +++ b/app-emulation/docker/docker-19.03.13.ebuild @@ -24,7 +24,7 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker HOMEPAGE="https://www.docker.com/" LICENSE="Apache-2.0" SLOT="0" -IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp selinux" +IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux" # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies BDEPEND=" @@ -89,6 +89,10 @@ CONFIG_CHECK=" ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER ~IPVLAN ~MACVLAN ~DUMMY + + ~OVERLAY_FS + ~EXT4_FS_SECURITY + ~EXT4_FS_POSIX_ACL " ERROR_KEYS="CONFIG_KEYS: is mandatory" @@ -179,12 +183,6 @@ pkg_setup() { " fi - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - linux-info_pkg_setup }