Merge pull request #6748 from AkihiroSuda/crun-1.4.4

fuweid · web-flow · commit 9617d2f29bfa · 2022-03-30T22:10:27.000+08:00
CI: bump up crun to 1.4.4
diff --git a/script/setup/crun-version b/script/setup/crun-version
@@ -0,0 +1 @@
+1.4.4
diff --git 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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`#`
`21`	`21`	`set -eu -o pipefail`
`22`	`22`
`23`		`-function install_runc() {`
`24`		`- script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"`
	`23`	`+script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"`
`25`	`24`
	`25`	`+function install_runc() {`
`26`	`26`	`# When updating runc-version, consider updating the runc module in go.mod as well`
`27`	`27`	`: "${RUNC_VERSION:=$(cat "${script_dir}/runc-version")}"`
`28`	`28`
`@@ -37,8 +37,8 @@ function install_runc() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`function install_crun() {`
`40`		`- CRUN_VERSION=1.3`
`41`		`- curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)"`
	`40`	`+ : "${CRUN_VERSION:=$(cat "${script_dir}/crun-version")}"`
	`41`	`+ curl -S -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)"`
`42`	`42`	`chmod +x /usr/local/sbin/runc`
`43`	`43`	`}`
`44`	`44`