commit:     3818f213a14b8c9a7876165670547d31d7dca4c0
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 14:40:11 2024 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 14:56:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3818f213

app-containers/docker: add 25.0.4

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/docker/Manifest             |   1 +
 app-containers/docker/docker-25.0.4.ebuild | 318 +++++++++++++++++++++++++++++
 2 files changed, 319 insertions(+)

diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 9374212fb0c8..d138746733e1 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -2,3 +2,4 @@ DIST docker-24.0.5.tar.gz 14456089 BLAKE2B 
be13a4256787152cb35ddb96d80e97a5e5b58
 DIST docker-24.0.6.tar.gz 14462378 BLAKE2B 
bced8e687abac59254a9969df46f323a835627a724889e5966bea08df8766b4291914442001d1b573280c45ac4d357a673e98e8fba2b8d116a1dbd65424ccf78
 SHA512 
d9bf0ba756b1ebe69a44819d7c6aa5d66dad8db5bcc41233e2bfce8131334a2fe1af3972de7f602b7911231288d29aaea797b7a05b335c2d7214a613b27c4b63
 DIST docker-24.0.7.tar.gz 14658649 BLAKE2B 
73bad494640ef8cad2b9b991f94414d8bec4dd88b120b0f8238f74d01269c445270f45410ac2c78af074356c3ba60a7c550ab28f5da5924bdc6d8b99e85a1360
 SHA512 
08f22fcbce163c3ba8eb21302fd38ff04fd3f27067f5715a3c527ba2efe67f694fac80bfe6d6b5e22d06d98917e1685a9d3d9b58991f221354f637f4a8bdc526
 DIST docker-25.0.1.tar.gz 15936052 BLAKE2B 
32b24893c9b098b218b16548be074588ad98ed31c8b87ab3fa467f79e33e96ce94f694b86f2920b1166e64c153b1c2482cb602117f673d23f0fc5ccc9b28ae92
 SHA512 
816c888925cf609e7caa6e491b45614f69fdd7df5ed4f783d8a77cf86d9f46f4f457a95a943aa75ecddf99d080daf78bc0dba55e9648960dc539b1ae62052361
+DIST docker-25.0.4.tar.gz 15953567 BLAKE2B 
85398de80b14f21d611822a1714ac987d919cf6a2a8059d8a6d41c9b63fd63a04013e47e01021eccdbd107f1a3f8ee55dc1ecbc4b6c9cc20ff2854434e3b6af7
 SHA512 
07e724de305def32a1e32a724a8041be193745c4f0d549708723cf5d14b840f74648e83e790fd526e00a6c6fdb7e487ee4e5ed0752fbe172d673ab86fe8819d2

diff --git a/app-containers/docker/docker-25.0.4.ebuild 
b/app-containers/docker/docker-25.0.4.ebuild
new file mode 100644
index 000000000000..739506d1d063
--- /dev/null
+++ b/app-containers/docker/docker-25.0.4.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+MY_PV=${PV/_/-}
+inherit linux-info systemd udev golang-vcs-snapshot
+GIT_COMMIT=061aa95809be396a6b5542618d8a34b02a21ff77
+
+DESCRIPTION="The core functions you need to create Docker images and run 
Docker containers"
+HOMEPAGE="https://www.docker.com/";
+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"
+
+DEPEND="
+       acct-group/docker
+       >=dev-db/sqlite-3.7.9:3
+       apparmor? ( sys-libs/libapparmor )
+       btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+       seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# 
https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# 
https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+       ${DEPEND}
+       >=net-firewall/iptables-1.4
+       sys-process/procps
+       >=dev-vcs/git-1.7
+       >=app-arch/xz-utils-4.9
+       dev-libs/libltdl
+       >=app-containers/containerd-1.7.12[apparmor?,btrfs?,seccomp?]
+       >=app-containers/runc-1.1.12[apparmor?,seccomp?]
+       !app-containers/docker-proxy
+       container-init? ( >=sys-process/tini-0.19.0[static] )
+       selinux? ( sec-policy/selinux-docker )
+"
+
+# 
https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+       >=dev-lang/go-1.16.12
+       dev-go/go-md2man
+       virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=(
+       "${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
+)
+
+pkg_setup() {
+       # this is based on "contrib/check-config.sh" from upstream's sources
+       # required features.
+       CONFIG_CHECK="
+               ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+               ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER 
~CGROUP_SCHED ~CPUSETS ~MEMCG
+               ~KEYS
+               ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+               ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+               ~NETFILTER_XT_MATCH_ADDRTYPE
+               ~NETFILTER_XT_MATCH_CONNTRACK
+               ~NETFILTER_XT_MATCH_IPVS
+               ~NETFILTER_XT_MARK
+               ~IP_NF_NAT ~NF_NAT
+               ~POSIX_MQUEUE
+       "
+       WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for 
bind-mounting /dev/mqueue into containers"
+
+       if kernel_is lt 4 8; then
+               CONFIG_CHECK+="
+                       ~DEVPTS_MULTIPLE_INSTANCES
+               "
+       fi
+
+       if kernel_is le 5 1; then
+               CONFIG_CHECK+="
+                       ~NF_NAT_IPV4
+               "
+       fi
+
+       if kernel_is le 5 2; then
+               CONFIG_CHECK+="
+                       ~NF_NAT_NEEDED
+               "
+       fi
+
+       if kernel_is ge 4 15; then
+               CONFIG_CHECK+="
+                       ~CGROUP_BPF
+               "
+       fi
+
+       # optional features
+       CONFIG_CHECK+="
+               ~USER_NS
+       "
+
+       if use seccomp; then
+               CONFIG_CHECK+="
+                       ~SECCOMP ~SECCOMP_FILTER
+               "
+       fi
+
+       CONFIG_CHECK+="
+               ~CGROUP_PIDS
+       "
+
+       if kernel_is lt 6 1; then
+               CONFIG_CHECK+="
+                       ~MEMCG_SWAP
+                       "
+       fi
+
+       if kernel_is le 5 8; then
+               CONFIG_CHECK+="
+                       ~MEMCG_SWAP_ENABLED
+               "
+       fi
+
+       CONFIG_CHECK+="
+               ~!LEGACY_VSYSCALL_NATIVE
+               "
+       if kernel_is lt 5 19; then
+               CONFIG_CHECK+="
+                       ~LEGACY_VSYSCALL_EMULATE
+                       "
+       fi
+       CONFIG_CHECK+="
+               ~!LEGACY_VSYSCALL_NONE
+               "
+       WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
+               Containers with <=glibc-2.13 will not work"
+
+       if kernel_is le 4 5; then
+               CONFIG_CHECK+="
+                       ~MEMCG_KMEM
+               "
+       fi
+
+       if kernel_is lt 5; then
+               CONFIG_CHECK+="
+                       ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+               "
+       fi
+
+       CONFIG_CHECK+="
+               ~BLK_CGROUP ~BLK_DEV_THROTTLING
+               ~CGROUP_PERF
+               ~CGROUP_HUGETLB
+               ~NET_CLS_CGROUP ~CGROUP_NET_PRIO
+               ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+               ~IP_NF_TARGET_REDIRECT
+               ~IP_VS
+               ~IP_VS_NFCT
+               ~IP_VS_PROTO_TCP
+               ~IP_VS_PROTO_UDP
+               ~IP_VS_RR
+               "
+
+       if use selinux; then
+               CONFIG_CHECK+="
+                       ~SECURITY_SELINUX
+                       "
+       fi
+
+       if use apparmor; then
+               CONFIG_CHECK+="
+                       ~SECURITY_APPARMOR
+                       "
+       fi
+
+       # if ! is_set EXT4_USE_FOR_EXT2; then
+       #       check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL 
EXT3_FS_SECURITY
+       #       if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set 
EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+       #               echo "    $(wrap_color '(enable these ext3 configs if 
you are using ext3 as backing filesystem)' bold black)"
+       #       fi
+       # fi
+
+       CONFIG_CHECK+="
+               ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+       "
+
+       # if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set 
EXT4_FS_SECURITY; then
+       #       if is_set EXT4_USE_FOR_EXT2; then
+       #               echo "    $(wrap_color 'enable these ext4 configs if 
you are using ext3 or ext4 as backing filesystem' bold black)"
+       #       else
+       #               echo "    $(wrap_color 'enable these ext4 configs if 
you are using ext4 as backing filesystem' bold black)"
+       #       fi
+       # fi
+
+       # network drivers
+       CONFIG_CHECK+="
+               ~VXLAN ~BRIDGE_VLAN_FILTERING
+               ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
+               ~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
+       "
+       if kernel_is le 5 3; then
+               CONFIG_CHECK+="
+                       ~INET_XFRM_MODE_TRANSPORT
+               "
+       fi
+
+       CONFIG_CHECK+="
+               ~IPVLAN
+               "
+       CONFIG_CHECK+="
+               ~MACVLAN ~DUMMY
+               "
+       CONFIG_CHECK+="
+               ~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
+       "
+
+       # storage drivers
+       if use btrfs; then
+               CONFIG_CHECK+="
+                       ~BTRFS_FS
+                       ~BTRFS_FS_POSIX_ACL
+               "
+       fi
+
+       CONFIG_CHECK+="
+               ~OVERLAY_FS
+       "
+
+       linux-info_pkg_setup
+}
+
+src_compile() {
+       export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+       export GOPATH="${WORKDIR}/${P}"
+       export VERSION=${PV}
+
+       # setup CFLAGS and LDFLAGS for separate build target
+       # see https://github.com/tianon/docker-overlay/pull/10
+       export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+       export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+       # let's set up some optional features :)
+       export DOCKER_BUILDTAGS=''
+       for gd in btrfs overlay; do
+               if ! use $gd; then
+                       DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+               fi
+       done
+
+       for tag in apparmor seccomp; do
+               if use $tag; then
+                       DOCKER_BUILDTAGS+=" $tag"
+               fi
+       done
+
+       # build binaries
+       ./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+       dosym containerd /usr/bin/docker-containerd
+       dosym containerd-shim /usr/bin/docker-containerd-shim
+       dosym runc /usr/bin/docker-runc
+       use container-init && dosym tini /usr/bin/docker-init
+       dobin bundles/dynbinary-daemon/dockerd
+       dobin bundles/dynbinary-daemon/docker-proxy
+
+       newinitd contrib/init/openrc/docker.initd docker
+       newconfd contrib/init/openrc/docker.confd docker
+
+       systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+       udev_dorules contrib/udev/*.rules
+
+       dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
+       dodoc -r docs/*
+
+       # note: intentionally not using "doins" so that we preserve +x bits
+       dodir /usr/share/${PN}/contrib
+       cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+       udev_reload
+
+       elog
+       elog "To use Docker, the Docker daemon must be running as root. To 
automatically"
+       elog "start the Docker daemon at boot:"
+       if systemd_is_booted || has_version sys-apps/systemd; then
+               elog "  systemctl enable docker.service"
+       else
+               elog "  rc-update add docker default"
+       fi
+       elog
+       elog "To use Docker as a non-root user, add yourself to the 'docker' 
group:"
+       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
+}
+
+pkg_postrm() {
+       udev_reload
+}

Reply via email to