From e2d9556c3f8606d34f0714b96759ec2679972f91 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 6 Dec 2021 08:16:02 +0000 Subject: [PATCH] app-emulation: Upgrade Runc 1.0.2 to 1.0.3 --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-emulation/docker-runc/Manifest | 2 +- .../{docker-runc-1.0.2.ebuild => docker-runc-1.0.3.ebuild} | 4 ++-- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2021-12-06-runc-update.md | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/{docker-runc-1.0.2.ebuild => docker-runc-1.0.3.ebuild} (94%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2021-12-06-runc-update.md diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 43e59bf3db..070e511ed5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -29,7 +29,7 @@ SLOT="0" IUSE="+btrfs hardened" DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="~app-emulation/docker-runc-1.0.2 +RDEPEND="~app-emulation/docker-runc-1.0.3 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest index 8442789bf3..9012d22bf5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest @@ -1 +1 @@ -DIST docker-runc-1.0.2.tar.gz 2376750 BLAKE2B c91e7800a5bd565ddf4df1494c5cdd3ca008051a53493be513145b5904001f3d1d0bc3d1aa1484f17102e705de6b113cd4d3c0a66699eb24b7929a149f0e5295 SHA512 0859148fa40fd4c63e28662c392eb3c32536e8d0fa157a7e49ebc78cc03568b479833018b5f3ad71aa3f7971a370ea0787b6e24ce4a90c5d236640624e6ad100 +DIST docker-runc-1.0.3.tar.gz 2377894 BLAKE2B 56407cdbe3d5c22f949ec86f75ad14e2e4c0893e1741a449babd0f29bd2e9faca22df021aa7682021a387f9ba65335d05887868af2a4236beef34928aea12f42 SHA512 7f1a886597bc66ad4e1afebddd4cce70e5ef22426a4b83c0cd5cb89846b4c90816ef776b360681f2647866455928529a66896ff4bec4892d88399363113b3505 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild index 07e4f0e7bd..7fcbeebd67 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild @@ -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="61ab78b58f2c0c3fbfc63477f2c020e825b9789d" +COMMIT_ID="e4bccdbd64361ac5ea8ba90bb8845add78f957a6" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -55,7 +55,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.0.2+dev.docker-20.10 \ + VERSION=1.0.3+dev.docker-20.10 \ COMMIT="${COMMIT_ID}" } diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index 9aa37e0eb7..c3375dc2c1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -15,7 +15,7 @@ RDEPEND=" ~app-emulation/docker-cli-20.10.11 ~app-emulation/containerd-1.5.8 ~app-emulation/docker-proxy-0.8.0_p20210525 - ~app-emulation/docker-runc-1.0.2 + ~app-emulation/docker-runc-1.0.3 =dev-libs/libltdl-2.4.6 ~sys-process/tini-0.19.0 " diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2021-12-06-runc-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2021-12-06-runc-update.md new file mode 100644 index 0000000000..9e46f2d86b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2021-12-06-runc-update.md @@ -0,0 +1 @@ +- runc ([1.0.3](https://github.com/opencontainers/runc/releases/tag/v1.0.3))