From f80bf9be865a6cd86ef3d42cbb9f64c7c8eaab0f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 9 Jun 2022 07:54:27 +0000 Subject: [PATCH] app-emulation: Upgrade Runc 1.1.2 to 1.1.3 --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-emulation/docker-runc/Manifest | 2 +- .../{docker-runc-1.1.2.ebuild => docker-runc-1.1.3.ebuild} | 4 ++-- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 2 +- .../changelog/updates/2022-06-09-runc-1.1.3-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.1.2.ebuild => docker-runc-1.1.3.ebuild} (94%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-09-runc-1.1.3-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 d0cb2dea67..b7a14b6808 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.1.2 +RDEPEND="~app-emulation/docker-runc-1.1.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 e1b055b85f..3f799634b9 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.1.2.tar.gz 2335347 BLAKE2B 1574284d4d08c3c54f478b7f6a11e3a41035f728bdfd1e9a0c3cbdd4f10596e7ba7abe73a17252db6642a051df91b287e6b7fb6378543e814786d9e01f0e89e1 SHA512 de434a156fb39a85a46537cd0018f78d75ae5e64979966fb190c7d6aa2d6d35a3c7f8338f11da0da8b70f85ce7e0b1adacbdaa13575801a0863609cfed7f898f +DIST docker-runc-1.1.3.tar.gz 2335948 BLAKE2B 2b14c203b2f1e5c68745076ac8829bef42a477715b07c3aedfd3385ea0996c736aedb026453af0f4869e8a88c16f68ca2b19a9e61d32443653e5d1e7c151f45d SHA512 5b73647884b95e1d05e3449232bc321649d05d5a670db8b838e04b6c57e6e461ec6151190a7edfba6df58f82461172e962a334834206cbf729a27f8447a7ac74 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.3.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.3.ebuild index dab492379e..7f32af0646 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.3.ebuild @@ -8,7 +8,7 @@ COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.18" # 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="c2cce1c71eab3a82702189ac59888dcc2f15601a" +COMMIT_ID="f423b67d3b7f70290fb6610f0368ab245589a172" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -55,7 +55,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.1.2+dev.docker-20.10 \ + VERSION=1.1.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 35daf82d30..ed455b5fb4 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.16 ~app-emulation/containerd-1.6.4 ~app-emulation/docker-proxy-0.8.0_p20210525 - ~app-emulation/docker-runc-1.1.2 + ~app-emulation/docker-runc-1.1.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/2022-06-09-runc-1.1.3-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-09-runc-1.1.3-update.md new file mode 100644 index 0000000000..e9aba1383f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-09-runc-1.1.3-update.md @@ -0,0 +1 @@ +- runc ([1.1.3](https://github.com/opencontainers/runc/releases/tag/v1.1.3))