Merge pull request #1781 from flatcar-linux/runc-1.1.1-main

Upgrade Runc in main from 1.1.0 to 1.1.1
This commit is contained in:
Dongsu Park 2022-04-05 16:12:52 +02:00 committed by GitHub
commit 3f27ce29f9
5 changed files with 6 additions and 5 deletions

View File

@ -29,7 +29,7 @@ SLOT="0"
IUSE="+btrfs hardened"
DEPEND="btrfs? ( sys-fs/btrfs-progs )"
RDEPEND="~app-emulation/docker-runc-1.1.0
RDEPEND="~app-emulation/docker-runc-1.1.1
sys-libs/libseccomp"
S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}

View File

@ -1 +1 @@
DIST docker-runc-1.1.0.tar.gz 2334949 BLAKE2B 5b20cecae60e1ecf0239385d9236b59d40ae862f1f649887637c4462176fa7276613146bc5de91cd1ddd489dd4f867271327ec1c23d2ce0e519ac83a177e4bda SHA512 582240b489bb3f5e00f3384cbd8536f9e323df20443517264bf5cc5fbb0d7c6d255e0bf952eaaf5b046ce8dffa5bc84e08913a734a658afba804987223246a87
DIST docker-runc-1.1.1.tar.gz 2335245 BLAKE2B dc92b69748b31597120ccd655b13bad204100583a5aa535594e3bdae3982983e2a2067989c3ccd35244931a68d881178c39fd0d7613b2d52dba021575b74aa09 SHA512 c07970656dffd6e7c538da694b9065d57fecfa1852cfef67430aa41b6df3a869784e6db8e551b46d65137aae624ed105cc3c8b1a63a634d6948e1bd7948b7d78

View File

@ -8,7 +8,7 @@ COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.17"
# the commit of runc that docker uses.
# see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4
COMMIT_ID="b083ef4992ddc33fc7e699170c4abafa74d17818"
COMMIT_ID="886750b989c082700828ec1d3bbb1b397219bfac"
inherit eutils flag-o-matic coreos-go vcs-snapshot
@ -55,7 +55,7 @@ src_compile() {
)
GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
VERSION=1.1.0+dev.docker-20.10 \
VERSION=1.1.1+dev.docker-20.10 \
COMMIT="${COMMIT_ID}"
}

View File

@ -15,7 +15,7 @@ RDEPEND="
~app-emulation/docker-cli-20.10.14
~app-emulation/containerd-1.6.2
~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.0
~app-emulation/docker-runc-1.1.1
=dev-libs/libltdl-2.4.6
~sys-process/tini-0.19.0
"

View File

@ -0,0 +1 @@
- runc ([1.1.1](https://github.com/opencontainers/runc/releases/tag/v1.1.1))