Skip to content

Commit cc2ceda

Browse files
committed
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 fef78c1. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 3c09735 commit cc2ceda

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

script/setup/install-runc

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,11 @@ function install_runc() {
3434
: "${RUNC_REPO:=https://github.com/opencontainers/runc.git}"
3535

3636
TMPROOT=$(mktemp -d)
37-
# runc is incompatible with Go 1.22 on glibc-based distros
38-
# https://github.com/opencontainers/runc/issues/4233
39-
GO121DIR="${TMPROOT}"/go121
40-
mkdir -p "${GO121DIR}"
41-
GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.11@latest
42-
GO121="${GO121DIR}"/go1.21.11
43-
$GO121 download
4437
git clone "${RUNC_REPO}" "${TMPROOT}"/runc
4538
pushd "${TMPROOT}"/runc
4639
git checkout "${RUNC_VERSION}"
47-
make GO=$GO121 BUILDTAGS='seccomp' runc
48-
$SUDO make GO=$GO121 install
40+
make BUILDTAGS='seccomp' runc
41+
$SUDO make install
4942
popd
5043
rm -fR "${TMPROOT}"
5144
}

0 commit comments

Comments
 (0)