commit:     c1c82fb9d38f55a05583727d46ef6d77c40f6464
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 19:32:47 2023 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 19:32:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c82fb9

app-containers/docker: add 24.0.4

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

 app-containers/docker/Manifest             |   1 +
 app-containers/docker/docker-24.0.4.ebuild | 329 +++++++++++++++++++++++++++++
 2 files changed, 330 insertions(+)

diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 4d116d6ba088..a77b218db14d 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,2 +1,3 @@
 DIST docker-23.0.3.tar.gz 13621933 BLAKE2B 
fd548b6083df495c35cc4d27374afdbc37e3678454b33477e9e88ba7c1564901d91a87eb0b87da2cfeab6a7c120bec95cad3a94db15a49719713a3660fae9958
 SHA512 
1f47a0c669c07ad1e628c99d153623076cd5c8e65e82fa54f7dd0d32579fae803ec9bee748e4ba1a6dc8fe37654602aaf005e58e09f00d8ff4f32e6047240caa
 DIST docker-23.0.4.tar.gz 13625597 BLAKE2B 
ab4d50e9b334f18e620979bc13a7b146f8e0381d52aca0e45785108f1d53743e0157eb1e5bda76bc1300df1aa7825ca1ca141a21aeea39e81bc626ad1ea77775
 SHA512 
94d2c748541cf402197e98f93f574daf72bd84fc7603bf30e23674be36862ddbff5f37ad667455a710d730b9c5bc11962c287d6fd60a20320e0e0a41e3329c44
+DIST docker-24.0.4.tar.gz 14453359 BLAKE2B 
d089721469857eee87fd63b04c43cfde97ab9a38b5017c52c859b9b291574be4055b25585304434e070a7b74f90fa2582bb4fd8cddeae795637aaa23242fe8cb
 SHA512 
5d749764a3541104d13ebe42e7b4225f66a98f9cc81f6406790be8a534f6c0d5ec13b145212bf75899e489feddf7679add6f43c6f9dd76b704291ed0e638eb6e

diff --git a/app-containers/docker/docker-24.0.4.ebuild 
b/app-containers/docker/docker-24.0.4.ebuild
new file mode 100644
index 000000000000..155a3ea0ce4e
--- /dev/null
+++ b/app-containers/docker/docker-24.0.4.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2023 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=4ffc61430bbe6d3d405bdf357b766bf303ff3cc5
+
+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 device-mapper 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 )
+       device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+       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.1[apparmor?,btrfs?,device-mapper?,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
+
+       if use device-mapper; then
+               CONFIG_CHECK+="
+                       ~BLK_DEV_DM ~DM_THIN_PROVISIONING
+               "
+       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 device-mapper 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 daemon
+       ./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
+       newbin bundles/dynbinary-daemon/dockerd dockerd
+
+       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 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
+               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