app-containers/docker{,-cli}: sync with gentoo

Commit-Ref: 84ebb8f151a3853fc46cf22cf7cdc73dcf0df7a7 Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar · Sep 16, 2024 · fd8ca78 · fd8ca78
1 parent 5996901
commit fd8ca78
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest
@@ -1,4 +1,4 @@
 DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101bf457f7fc1c24dff195ce8b478268335419fba5ff51a7b77bb8c0a6e0e6077d83ddb50f2ecf08bf069be89fc4849afd6e SHA512 36297ee3cbf096112ec41db2cd1d06796ddd27a57c4323e71a727e17d3930102710f643a77df9e68cd9b3294a6bb0fdf5565379e9fae7331e25afcd147b0084f
 DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87
-DIST docker-cli-27.1.2-man.tar.xz 79028 BLAKE2B 7813a44dd4625b9b446f4e2250bae472f994427f26c4c403d9140b2ab11e569e1244e44eb56564bd1ff7becb9a72f3bedb7804a9f10ad6c2250aea5ae572caf3 SHA512 a45f6d4785880203a147e26397ad22ad06384b2f7ee0d8598993a77d7ec145175be7fac3d47f826da1c1425885c720edee77f6ddd65986c116907b34a73771c9
-DIST docker-cli-27.1.2.tar.gz 7142511 BLAKE2B ddfe471dd9628660d56ebaf7cdde4ed6c2047b91725c9f9d4bff08cfa8a51637d45dc3b6c0a08fa98c636c2b6c32759bd53e9db6e606c5e77cd21fa409ab12fd SHA512 5c75d32c8e9598282de32ac8a2ebbc2eda712a010449edbd6e66f0652c4e02b124df70596d9f1076de3c4a95920b4cc16c35fb343624de1363557ab48976e153
+DIST docker-cli-27.2.0-man.tar.xz 79052 BLAKE2B 019299b8cd0adbb1a3749f9aa37b1e38bf212b2c13eee81ae49f843bcc56ff3f41413e1021bebf5c88b4406d7928c2c40de026df861195aa2df79d9c724f8b87 SHA512 d61d6f9f9139f2d22268932d795a50e7b9b1ff993699ba87ca9353cb9908ac18c103a34ee9a486f3537988d6ba7317b05588cd84ff8327b86826ab7ed5023947
+DIST docker-cli-27.2.0.tar.gz 7236608 BLAKE2B 828f002d83de47efad370e28df2f5e50f75da7952bf4fcbe30d3d66c9bc281ee99fab820f7bca002c8eb13fa29b7518e951974b62008e213662c1d384a286c0d SHA512 5dce9e974a96b2518a73d50a9421d12feeb9cc792bb89000f26e04a91fdddade2648dea39aa721e48c9b07bfc18f7a6676fb7e286ae779556753886ec45e86c3
diff --git a/...iners/docker-cli/docker-cli-27.1.2.ebuild → ...iners/docker-cli/docker-cli-27.2.0.ebuild b/...iners/docker-cli/docker-cli-27.1.2.ebuild → ...iners/docker-cli/docker-cli-27.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-GIT_COMMIT=d01f264bccd8bed2e3c038054a04b99533478ab8
+GIT_COMMIT=3ab42569583b58dbc6f167d842d5a3dd5972065f
 
 EGO_PN="github.com/docker/cli"
 MY_PV=${PV/_/-}

diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest
@@ -1,2 +1,2 @@
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.1.2.tar.gz 16608463 BLAKE2B 27d8ab2e917c838007f8bc286899ed65e9f9a16d67d77034845ec5b04ef2733887dec3a18c224130823516738fb40c6c731962538b61603e94746e2c32d721a5 SHA512 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92
+DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
diff --git a/...pp-containers/docker/docker-27.1.2.ebuild → ...pp-containers/docker/docker-27.2.0.ebuild b/...pp-containers/docker/docker-27.1.2.ebuild → ...pp-containers/docker/docker-27.2.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 EGO_PN=github.com/docker/docker
 MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info systemd udev
-GIT_COMMIT=f9522e5e96c3ab5a6b8a643d15a92700ca864da6
+inherit golang-vcs-snapshot linux-info optfeature systemd udev
+GIT_COMMIT=3ab5c7d0036ca8fc43141e83b167456ec79828aa
 
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
 HOMEPAGE="https://www.docker.com/"
@@ -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 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init overlay seccomp selinux systemd"
+IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
 
 DEPEND="
 	acct-group/docker
@@ -33,7 +33,7 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.20[apparmor?,btrfs?,seccomp?]
+	>=app-containers/containerd-1.7.21[apparmor?,btrfs?,seccomp?]
 	>=app-containers/runc-1.1.13[apparmor?,seccomp?]
 	!app-containers/docker-proxy
 	container-init? ( >=sys-process/tini-0.19.0[static] )
@@ -246,7 +246,7 @@ src_compile() {
 
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay; do
+	for gd in btrfs overlay2; do
 		if ! use $gd; then
 			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
 		fi
@@ -271,6 +271,9 @@ src_install() {
 	use container-init && dosym tini /usr/bin/docker-init
 	dobin bundles/dynbinary-daemon/dockerd
 	dobin bundles/dynbinary-daemon/docker-proxy
+	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
+		dosym ../share/docker/contrib/${f} /usr/bin/${f}
+	done
 
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
@@ -303,17 +306,16 @@ pkg_postinst() {
 	elog '  usermod -aG docker <youruser>'
 	elog
 
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
 	if has_version sys-fs/zfs; then
 		elog " ZFS storage driver is available"
 		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
 		elog
 	fi
+
+	optfeature "rootless mode support" sys-apps/shadow
+	optfeature "rootless mode support" sys-apps/rootlesskit
+	optfeature_header "for rootless mode you also need a network stack"
+	optfeature "rootless mode network stack" app-containers/slirp4netns
 }
 
 pkg_postrm() {

diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/metadata.xml b/sdk_container/src/third_party/portage-stable/app-containers/docker/metadata.xml
@@ -25,6 +25,10 @@
 			Enables dependencies for the "overlay" graph driver, including
 			necessary kernel flags.
 		</flag>
+		<flag name="overlay2">
+			Enables dependencies for the "overlay2" graph driver, including
+			necessary kernel flags.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">moby/moby</remote-id>