From 3c097352af6ffc64fb7c209d8474030b0f28f57d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 13 Jun 2024 18:28:41 +0200 Subject: [PATCH 1/2] update runc binary to v1.1.13 full diff: https://github.com/opencontainers/runc/compare/v1.1.12...v1.1.13 Release notes: * If building with Go 1.22.x, make sure to use 1.22.4 or a later version. * Support go 1.22.4+. * runc list: fix race with runc delete. * Fix set nofile rlimit error. * libct/cg/fs: fix setting rt_period vs rt_runtime. * Fix a debug msg for user ns in nsexec. * script/*: fix gpg usage wrt keyboxd. * CI fixes and misc backports. * Fix codespell warnings. * Silence security false positives from golang/net. * libcontainer: allow containers to make apps think fips is enabled/disabled for testing. * allow overriding VERSION value in Makefile. * Vagrantfile.fedora: bump Fedora to 39. * ci/cirrus: rm centos stream 8. Signed-off-by: Sebastiaan van Stijn --- script/setup/runc-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/setup/runc-version b/script/setup/runc-version index 19f5e1b57..a829bcbe4 100644 --- a/script/setup/runc-version +++ b/script/setup/runc-version @@ -1 +1 @@ -v1.1.12 +v1.1.13 From cc2cedae06b9b6ddb9bedcfba176218c84cc9d5d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 13 Jun 2024 18:29:47 +0200 Subject: [PATCH 2/2] Revert "install-runc: pin Go to 1.21" Now that we're on runc v1.1.13, we no longer need to pin the go version fo runc to go1.21 This reverts commit fef78c102407c77b5d5aa4c5b164c9a093bb76af. Signed-off-by: Sebastiaan van Stijn --- script/setup/install-runc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/script/setup/install-runc b/script/setup/install-runc index 940b75d7c..07a3be7c8 100755 --- a/script/setup/install-runc +++ b/script/setup/install-runc @@ -34,18 +34,11 @@ function install_runc() { : "${RUNC_REPO:=https://github.com/opencontainers/runc.git}" TMPROOT=$(mktemp -d) - # runc is incompatible with Go 1.22 on glibc-based distros - # https://github.com/opencontainers/runc/issues/4233 - GO121DIR="${TMPROOT}"/go121 - mkdir -p "${GO121DIR}" - GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.11@latest - GO121="${GO121DIR}"/go1.21.11 - $GO121 download git clone "${RUNC_REPO}" "${TMPROOT}"/runc pushd "${TMPROOT}"/runc git checkout "${RUNC_VERSION}" - make GO=$GO121 BUILDTAGS='seccomp' runc - $SUDO make GO=$GO121 install + make BUILDTAGS='seccomp' runc + $SUDO make install popd rm -fR "${TMPROOT}" }