Merge pull request #723 from flatcar/runc-1.1.6-main

Upgrade Runc in main from 1.1.5 to 1.1.6
This commit is contained in:
Dongsu Park 2023-04-25 17:06:33 +02:00 committed by GitHub
commit aba3b7ac30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View File

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

View File

@ -1 +1 @@
DIST docker-runc-1.1.5.tar.gz 2337543 BLAKE2B ed2aed98c4e8fcfe7040772df9e090e38a95355bcfa2948030866b83b8097794df9e0ebe2bb1a99f5c63a6d5300493d67493018957f6116ee07d66872f87bef3 SHA512 8a4cde9a8aaa5e1f75ec6731b18f56aa34ab969246f4a8d6ebfea5d100b0c113553bec49f29b851129d371a13c803c1e86425779eb8d498dba588c63d2a2ac57 DIST docker-runc-1.1.6.tar.gz 2501365 BLAKE2B a9b4827acb6415209f2f6887d35daa87140fb91fa7388f2b8762ebfbed8fa3ab7c7525f85b67de91609df553ae3082306ee9e3e8c8b69ee22272ae42b3e3b43f SHA512 4c61a72a9a2fa09990f62949ca6fc017bcec1ba945b4eea3b92078b4eb3100c171d3d69f537dc036980f60fbdfff00082556847a5a82c415d094e18b702a36b8

View File

@ -8,7 +8,7 @@ COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.18" COREOS_GO_VERSION="go1.18"
# the commit of runc that docker uses. # 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 # see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4
COMMIT_ID="4ef48971e5d827018b74876a06e32ab7636f0a26" COMMIT_ID="3ea7dfa0b63a3f1472596d3c91060da4d538615f"
inherit eutils flag-o-matic coreos-go vcs-snapshot inherit eutils flag-o-matic coreos-go vcs-snapshot
@ -55,7 +55,7 @@ src_compile() {
) )
GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
VERSION=1.1.5+dev.docker-20.10 \ VERSION=1.1.6+dev.docker-20.10 \
COMMIT="${COMMIT_ID}" COMMIT="${COMMIT_ID}"
} }

View File

@ -15,7 +15,7 @@ RDEPEND="
~app-emulation/docker-cli-20.10.24 ~app-emulation/docker-cli-20.10.24
~app-emulation/containerd-1.6.20 ~app-emulation/containerd-1.6.20
~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.5 ~app-emulation/docker-runc-1.1.6
=dev-libs/libltdl-2.4.7 =dev-libs/libltdl-2.4.7
~sys-process/tini-0.19.0 ~sys-process/tini-0.19.0
" "