mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-containers/docker: Sync with Gentoo

Browse Source 
It's from Gentoo commit e32c81b6dd523b0339eca5dc75129b6e0b8f1c0f.
This commit is contained in:
Flatcar Buildbot 2024-02-19 07:11:13 +00:00 committed by Krzesimir Nowak
parent 78bdfdba14
commit 69f3a6d13d
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sdk_container/src/third_party/portage-stable/app-containers/docker/docker-25.0.1.ebuild vendored
View File

@ -14,14 +14,13 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux" IUSE="apparmor btrfs +container-init overlay seccomp selinux"
DEPEND=" DEPEND="
acct-group/docker acct-group/docker
>=dev-db/sqlite-3.7.9:3 >=dev-db/sqlite-3.7.9:3
apparmor? ( sys-libs/libapparmor ) apparmor? ( sys-libs/libapparmor )
btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
seccomp? ( >=sys-libs/libseccomp-2.2.1 ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
" "
@ -34,7 +33,7 @@ RDEPEND="
>=dev-vcs/git-1.7 >=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
dev-libs/libltdl dev-libs/libltdl
>=app-containers/containerd-1.7.3[apparmor?,btrfs?,device-mapper?,seccomp?] >=app-containers/containerd-1.7.3[apparmor?,btrfs?,seccomp?]
>=app-containers/runc-1.1.9[apparmor?,seccomp?] >=app-containers/runc-1.1.9[apparmor?,seccomp?]
!app-containers/docker-proxy !app-containers/docker-proxy
container-init? ( >=sys-process/tini-0.19.0[static] ) container-init? ( >=sys-process/tini-0.19.0[static] )
@ -227,12 +226,6 @@ pkg_setup() {
" "
fi fi
if use device-mapper; then
CONFIG_CHECK+="
~BLK_DEV_DM ~DM_THIN_PROVISIONING
"
fi
CONFIG_CHECK+=" CONFIG_CHECK+="
~OVERLAY_FS ~OVERLAY_FS
" "
@ -252,7 +245,7 @@ src_compile() {
# let's set up some optional features :) # let's set up some optional features :)
export DOCKER_BUILDTAGS='' export DOCKER_BUILDTAGS=''
for gd in btrfs device-mapper overlay; do for gd in btrfs overlay; do
if ! use $gd; then if ! use $gd; then
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
fi fi
@ -307,12 +300,6 @@ pkg_postinst() {
elog ' usermod -aG docker <youruser>' elog ' usermod -aG docker <youruser>'
elog elog
if use device-mapper; then
elog " Devicemapper storage driver has been deprecated"
elog " It will be removed in a future release"
elog
fi
if use overlay; then if use overlay; then
elog " Overlay storage driver/USEflag has been deprecated" elog " Overlay storage driver/USEflag has been deprecated"
elog " in favor of overlay2 (enabled unconditionally)" elog " in favor of overlay2 (enabled unconditionally)"

4
sdk_container/src/third_party/portage-stable/app-containers/docker/metadata.xml vendored
View File

@ -12,10 +12,6 @@
<email>williamh@gentoo.org</email> <email>williamh@gentoo.org</email>
<name>William Hubbs</name> <name>William Hubbs</name>
</maintainer> </maintainer>
<maintainer type="person">
<email>gyakovlev@gentoo.org</email>
<name>Georgy Yakovlev</name>
</maintainer>
<use> <use>
<flag name="btrfs"> <flag name="btrfs">
Enables dependencies for the "btrfs" graph driver, including Enables dependencies for the "btrfs" graph driver, including