-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1628 from flatcar/krnowak/docker-runc-beta
docker 24.0.9, runc 1.1.12, containerd 1.7.13 for beta
- Loading branch information
Showing
16 changed files
with
1,301 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| - docker ([CVE-2024-24557](https://nvd.nist.gov/vuln/detail/CVE-2024-24557)) | ||
| - runc ([CVE-2024-21626](https://nvd.nist.gov/vuln/detail/CVE-2024-21626)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| - docker ([24.0.9](https://github.com/moby/moby/releases/tag/v24.0.9)) | ||
| - runc ([1.1.12](https://github.com/opencontainers/runc/releases/tag/v1.1.12)) | ||
| - containerd ([1.7.13](https://github.com/containerd/containerd/releases/tag/v1.7.13)) |
2 changes: 1 addition & 1 deletion
2
sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| DIST containerd-1.7.1.tar.gz 9682254 BLAKE2B f168070caf2b76f0be350a98f41bfdbfe6d78344d68821fb92a29f839a6e847d795e5b79436e36f985aa88028ff1c3f44f134cf6bd502ddac22453a457bd952b SHA512 e9b00ba8f4dd1b5b1088060d3822f684611d43b367ddfeb1bee1660140af85f31e9c9bfc600a67e8fc8645a625dc4e1919d9af7291bdeaa607bff7065a4fc945 | ||
| DIST containerd-1.7.10.tar.gz 10013345 BLAKE2B 9ba3dfa140f88eebca98b242cd08835dff8392a351f4232a538fbbb34cffdc9e3434322913ccec45801b6ed06d42a7bea787669d8e7156830dcdf76ccaa80ef9 SHA512 b3e9f13ad981b7a9226c23dda3f6bfdc2267c78d549d033d1cab8c4b94c2e6d62025259e80bad23cacbe1a06b39c098d6d4d48414180c85ef61bbb46b9b261d0 | ||
| DIST containerd-1.7.13.tar.gz 10047499 BLAKE2B 792eca378db4e1f7c57d68e00e2c77d11eab1ca60d280f662f1152a349d1c5ddc2a3a334484741e9a4a81f25cb800dce042eea94307c9f020d850ed81ef533aa SHA512 b2932387ea14b8fb76e2583b862ec6495b2e08a8fd7cdf169978d554e8b352b44bb27585c9de1e4e3bb3984d0050d0f3de9bc7a559205d3130c2fe40f961feb4 | ||
| DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5 | ||
| DIST containerd-1.7.6.tar.gz 9714550 BLAKE2B 863df1a8ab0f0fe6ec62893ed64824763c1b5230fe830fa268820ce0d6254c79e1ac62ab1261a74785b86b01dff83ea9109a899857fa47a48f2cf2eaf298fea8 SHA512 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...ntainer/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-24.0.7.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # Copyright 1999-2023 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=7 | ||
| GIT_COMMIT=afdd53b4e3 | ||
| EGO_PN="github.com/docker/cli" | ||
| MY_PV=${PV/_/-} | ||
| inherit bash-completion-r1 golang-vcs-snapshot | ||
|
|
||
| DESCRIPTION="the command line binary for docker" | ||
| HOMEPAGE="https://www.docker.com/" | ||
| SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" | ||
| SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" | ||
|
|
||
| LICENSE="Apache-2.0" | ||
| SLOT="0" | ||
| KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" | ||
| IUSE="hardened selinux" | ||
|
|
||
| RDEPEND="!<app-containers/docker-20.10.1 | ||
| selinux? ( sec-policy/selinux-docker )" | ||
| BDEPEND=" | ||
| >=dev-lang/go-1.16.6" | ||
|
|
||
| RESTRICT="installsources strip test" | ||
|
|
||
| S="${WORKDIR}/${P}/src/${EGO_PN}" | ||
|
|
||
| src_unpack() { | ||
| golang-vcs-snapshot_src_unpack | ||
| set -- ${A} | ||
| unpack ${2} | ||
| } | ||
|
|
||
| src_prepare() { | ||
| default | ||
| sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die | ||
| } | ||
|
|
||
| src_compile() { | ||
| export DISABLE_WARN_OUTSIDE_CONTAINER=1 | ||
| export GOPATH="${WORKDIR}/${P}" | ||
| # 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)" | ||
| emake \ | ||
| LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ | ||
| VERSION="${PV}" \ | ||
| GITCOMMIT="${GIT_COMMIT}" \ | ||
| dynbinary | ||
| } | ||
|
|
||
| src_install() { | ||
| dobin build/docker | ||
| doman "${WORKDIR}"/man/man?/* | ||
| dobashcomp contrib/completion/bash/* | ||
| bashcomp_alias docker dockerd | ||
| insinto /usr/share/fish/vendor_completions.d/ | ||
| doins contrib/completion/fish/docker.fish | ||
| insinto /usr/share/zsh/site-functions | ||
| doins contrib/completion/zsh/_* | ||
| } | ||
|
|
||
| pkg_postinst() { | ||
| has_version "app-containers/docker-buildx" && return | ||
| ewarn "the 'docker build' command is deprecated and will be removed in a" | ||
| ewarn "future release. If you need this functionality, install" | ||
| ewarn "app-containers/docker-buildx." | ||
| } |
70 changes: 70 additions & 0 deletions
70
...ntainer/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-24.0.9.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # Copyright 1999-2023 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=7 | ||
| GIT_COMMIT=2936816130 | ||
| EGO_PN="github.com/docker/cli" | ||
| MY_PV=${PV/_/-} | ||
| inherit bash-completion-r1 golang-vcs-snapshot | ||
|
|
||
| DESCRIPTION="the command line binary for docker" | ||
| HOMEPAGE="https://www.docker.com/" | ||
| SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" | ||
| #SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" | ||
|
|
||
| LICENSE="Apache-2.0" | ||
| SLOT="0" | ||
| KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" | ||
| IUSE="hardened selinux" | ||
|
|
||
| RDEPEND="!<app-containers/docker-20.10.1 | ||
| selinux? ( sec-policy/selinux-docker )" | ||
| BDEPEND=" | ||
| >=dev-lang/go-1.16.6" | ||
|
|
||
| RESTRICT="installsources strip test" | ||
|
|
||
| S="${WORKDIR}/${P}/src/${EGO_PN}" | ||
|
|
||
| src_unpack() { | ||
| golang-vcs-snapshot_src_unpack | ||
| set -- ${A} | ||
| #unpack ${2} | ||
| } | ||
|
|
||
| src_prepare() { | ||
| default | ||
| sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die | ||
| } | ||
|
|
||
| src_compile() { | ||
| export DISABLE_WARN_OUTSIDE_CONTAINER=1 | ||
| export GOPATH="${WORKDIR}/${P}" | ||
| # 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)" | ||
| emake \ | ||
| LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ | ||
| VERSION="${PV}" \ | ||
| GITCOMMIT="${GIT_COMMIT}" \ | ||
| dynbinary | ||
| } | ||
|
|
||
| src_install() { | ||
| dobin build/docker | ||
| #doman "${WORKDIR}"/man/man?/* | ||
| dobashcomp contrib/completion/bash/* | ||
| bashcomp_alias docker dockerd | ||
| insinto /usr/share/fish/vendor_completions.d/ | ||
| doins contrib/completion/fish/docker.fish | ||
| insinto /usr/share/zsh/site-functions | ||
| doins contrib/completion/zsh/_* | ||
| } | ||
|
|
||
| pkg_postinst() { | ||
| has_version "app-containers/docker-buildx" && return | ||
| ewarn "the 'docker build' command is deprecated and will be removed in a" | ||
| ewarn "future release. If you need this functionality, install" | ||
| ewarn "app-containers/docker-buildx." | ||
| } |
70 changes: 70 additions & 0 deletions
70
...ntainer/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-25.0.1.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # Copyright 1999-2024 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=7 | ||
| GIT_COMMIT=29cf629222 | ||
| EGO_PN="github.com/docker/cli" | ||
| MY_PV=${PV/_/-} | ||
| inherit bash-completion-r1 golang-vcs-snapshot | ||
|
|
||
| DESCRIPTION="the command line binary for docker" | ||
| HOMEPAGE="https://www.docker.com/" | ||
| SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" | ||
| SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" | ||
|
|
||
| LICENSE="Apache-2.0" | ||
| SLOT="0" | ||
| KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" | ||
| IUSE="hardened selinux" | ||
|
|
||
| RDEPEND="!<app-containers/docker-20.10.1 | ||
| selinux? ( sec-policy/selinux-docker )" | ||
| BDEPEND=" | ||
| >=dev-lang/go-1.16.6" | ||
|
|
||
| RESTRICT="installsources strip test" | ||
|
|
||
| S="${WORKDIR}/${P}/src/${EGO_PN}" | ||
|
|
||
| src_unpack() { | ||
| golang-vcs-snapshot_src_unpack | ||
| set -- ${A} | ||
| unpack ${2} | ||
| } | ||
|
|
||
| src_prepare() { | ||
| default | ||
| sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die | ||
| } | ||
|
|
||
| src_compile() { | ||
| export DISABLE_WARN_OUTSIDE_CONTAINER=1 | ||
| export GOPATH="${WORKDIR}/${P}" | ||
| # 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)" | ||
| emake \ | ||
| LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ | ||
| VERSION="${PV}" \ | ||
| GITCOMMIT="${GIT_COMMIT}" \ | ||
| dynbinary | ||
| } | ||
|
|
||
| src_install() { | ||
| dobin build/docker | ||
| doman "${WORKDIR}"/man/man?/* | ||
| dobashcomp contrib/completion/bash/* | ||
| bashcomp_alias docker dockerd | ||
| insinto /usr/share/fish/vendor_completions.d/ | ||
| doins contrib/completion/fish/docker.fish | ||
| insinto /usr/share/zsh/site-functions | ||
| doins contrib/completion/zsh/_* | ||
| } | ||
|
|
||
| pkg_postinst() { | ||
| has_version "app-containers/docker-buildx" && return | ||
| ewarn "the 'docker build' command is deprecated and will be removed in a" | ||
| ewarn "future release. If you need this functionality, install" | ||
| ewarn "app-containers/docker-buildx." | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| DIST docker-24.0.5.tar.gz 14456089 BLAKE2B be13a4256787152cb35ddb96d80e97a5e5b587094f1c61d18158737a037c4e81b88c186098ba7416eb7778022ece07bc31ee55af13d3e3da8e0bbd5452ad027f SHA512 cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6 | ||
| 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-24.0.9.tar.gz 14667617 BLAKE2B 4f72c08e21e7c0eacbae5f31bcab0aac64f12b70e5e7c54f49e4e9f3837194144ea46246b5ed53c25ecdb5edf9b710654221f6da10dec48de49a5481f9fb85ac SHA512 b71a058f32fb80676bb4c83f5d2236c9496ffc5c7f216ebff5bcac6f5959e121be3b2bfd2ff9aa5cccee27f71947dfe5b76090e82020806cc9ee452cd1f21084 | ||
| DIST docker-25.0.1.tar.gz 15936052 BLAKE2B 32b24893c9b098b218b16548be074588ad98ed31c8b87ab3fa467f79e33e96ce94f694b86f2920b1166e64c153b1c2482cb602117f673d23f0fc5ccc9b28ae92 SHA512 816c888925cf609e7caa6e491b45614f69fdd7df5ed4f783d8a77cf86d9f46f4f457a95a943aa75ecddf99d080daf78bc0dba55e9648960dc539b1ae62052361 |
Oops, something went wrong.