From b1030e7b681548207eba9bde0ca6aa1d8fbb0626 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 30 Mar 2022 20:37:24 +0900 Subject: [PATCH] CI: bump up crun to 1.4.4 https://github.com/containers/crun/compare/1.3...1.4.4 Also adds `crun-version` file for consistency with `runc-version`. (Note: unlike runc, crun does not prepend "v" to a version tag) Signed-off-by: Akihiro Suda --- script/setup/crun-version | 1 + script/setup/install-runc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 script/setup/crun-version diff --git a/script/setup/crun-version b/script/setup/crun-version new file mode 100644 index 000000000..1c99cf0e8 --- /dev/null +++ b/script/setup/crun-version @@ -0,0 +1 @@ +1.4.4 diff --git a/script/setup/install-runc b/script/setup/install-runc index 7e0437c9b..aa9f7bdbb 100755 --- a/script/setup/install-runc +++ b/script/setup/install-runc @@ -20,9 +20,9 @@ # set -eu -o pipefail -function install_runc() { - script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)" +script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)" +function install_runc() { # When updating runc-version, consider updating the runc module in go.mod as well : "${RUNC_VERSION:=$(cat "${script_dir}/runc-version")}" @@ -37,8 +37,8 @@ function install_runc() { } function install_crun() { - CRUN_VERSION=1.3 - curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)" + : "${CRUN_VERSION:=$(cat "${script_dir}/crun-version")}" + curl -S -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)" chmod +x /usr/local/sbin/runc }