mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 15:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-containers/docker: Sync with Gentoo

Browse Source 
It's from Gentoo commit 4136822dda26474b1f6573fb9edbd25b33a68846.
This commit is contained in:
Flatcar Buildbot 2024-09-02 07:12:25 +00:00 committed by Krzesimir Nowak
parent 516ea1fb05
commit 5055cd70da
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
DIST docker-27.0.3.tar.gz 16523895 BLAKE2B a86b2bf7ed85216f6a033a2fdb6cb0d545822570463b6b5f218052bf8e9ca3dde0e15ba4872da6370502a985e84ce704f810386b806e7dfb9d40d6d7b497d629 SHA512 bff7084f1bbe7fd6e4241d7172d3445b8ea36ef68ec5ee429a8ee27e1dfa81c1810d8ce07cb4c77f78037725c53d1de565e587d7f96994a653a09ce33e9bc344 DIST docker-27.1.2.tar.gz 16608463 BLAKE2B 27d8ab2e917c838007f8bc286899ed65e9f9a16d67d77034845ec5b04ef2733887dec3a18c224130823516738fb40c6c731962538b61603e94746e2c32d721a5 SHA512 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92

9
sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.0.3.ebuild → sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.1.2.ebuild vendored
View File

@ -5,7 +5,7 @@ EAPI=7
EGO_PN=github.com/docker/docker EGO_PN=github.com/docker/docker
MY_PV=${PV/_/-} MY_PV=${PV/_/-}
inherit golang-vcs-snapshot linux-info systemd udev inherit golang-vcs-snapshot linux-info systemd udev
GIT_COMMIT=662f78c0b1bb5114172427cfcb40491d73159be2 GIT_COMMIT=f9522e5e96c3ab5a6b8a643d15a92700ca864da6
DESCRIPTION="The core functions you need to create Docker images and run Docker containers" DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
HOMEPAGE="https://www.docker.com/" HOMEPAGE="https://www.docker.com/"
@ -33,8 +33,8 @@ RDEPEND="
sys-process/procps sys-process/procps
>=dev-vcs/git-1.7 >=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
>=app-containers/containerd-1.7.15[apparmor?,btrfs?,seccomp?] >=app-containers/containerd-1.7.20[apparmor?,btrfs?,seccomp?]
>=app-containers/runc-1.1.12[apparmor?,seccomp?] >=app-containers/runc-1.1.13[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] )
selinux? ( sec-policy/selinux-docker ) selinux? ( sec-policy/selinux-docker )
@ -54,7 +54,6 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 # https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
PATCHES=( PATCHES=(
"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch" "${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
"${FILESDIR}/docker-26.1.0-automagic-systemd.patch"
) )
pkg_setup() { pkg_setup() {
@ -259,7 +258,7 @@ src_compile() {
fi fi
done done
export SYSTEMD=$(usex systemd 1 0) export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
# build binaries # build binaries
./hack/make.sh dynbinary || die 'dynbinary failed' ./hack/make.sh dynbinary || die 'dynbinary failed'