From cf042a7e72014ca551603e1d8267476d995ee517 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 19 Jan 2022 11:14:29 +0000 Subject: [PATCH] app-emulation: Upgrade Runc 1.0.3 to 1.1.0 --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-emulation/docker-runc/Manifest | 2 +- .../{docker-runc-1.0.3.ebuild => docker-runc-1.1.0.ebuild} | 4 ++-- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2022-01-19-runc-1.1.0-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.3.ebuild => docker-runc-1.1.0.ebuild} (94%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-19-runc-1.1.0-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 031b1e78e2..b9a3151258 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.3 +RDEPEND="~app-emulation/docker-runc-1.1.0 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 9012d22bf5..5f68f8ccf6 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.3.tar.gz 2377894 BLAKE2B 56407cdbe3d5c22f949ec86f75ad14e2e4c0893e1741a449babd0f29bd2e9faca22df021aa7682021a387f9ba65335d05887868af2a4236beef34928aea12f42 SHA512 7f1a886597bc66ad4e1afebddd4cce70e5ef22426a4b83c0cd5cb89846b4c90816ef776b360681f2647866455928529a66896ff4bec4892d88399363113b3505 +DIST docker-runc-1.1.0.tar.gz 2334949 BLAKE2B 5b20cecae60e1ecf0239385d9236b59d40ae862f1f649887637c4462176fa7276613146bc5de91cd1ddd489dd4f867271327ec1c23d2ce0e519ac83a177e4bda SHA512 582240b489bb3f5e00f3384cbd8536f9e323df20443517264bf5cc5fbb0d7c6d255e0bf952eaaf5b046ce8dffa5bc84e08913a734a658afba804987223246a87 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.0.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.0.ebuild index 7fcbeebd67..cd5ce2b3c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.0.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="e4bccdbd64361ac5ea8ba90bb8845add78f957a6" +COMMIT_ID="b083ef4992ddc33fc7e699170c4abafa74d17818" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -55,7 +55,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.0.3+dev.docker-20.10 \ + VERSION=1.1.0+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 a78f93724c..ace0fae760 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.12 ~app-emulation/containerd-1.5.9 ~app-emulation/docker-proxy-0.8.0_p20210525 - ~app-emulation/docker-runc-1.0.3 + ~app-emulation/docker-runc-1.1.0 =dev-libs/libltdl-2.4.6 ~sys-process/tini-0.19.0 " diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-19-runc-1.1.0-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-19-runc-1.1.0-update.md new file mode 100644 index 0000000000..20fa2e7458 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-19-runc-1.1.0-update.md @@ -0,0 +1 @@ +- runc ([1.1.0](https://github.com/opencontainers/runc/releases/tag/v1.1.0))