From a68ebd09e6f7e5c2b90e72863bd6b9bf72936c2f Mon Sep 17 00:00:00 2001
From: Antony Chazapis <chazapis@ics.forth.gr>
Date: Fri, 21 Jul 2023 18:47:44 +0300
Subject: [PATCH] Use upstream runc with RISC-V support
Signed-off-by: Antony Chazapis <chazapis@ics.forth.gr>
---
go.mod | 2 +-
scripts/download | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 576c36c6884d..e108a6aad686 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ replace (
github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.1.1
github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f
github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1
- github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.7
+ github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.8
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78
github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.1
github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230425173236-39a4707f0689
diff --git a/scripts/download b/scripts/download
index c5f14932b23f..58c37b3f1c80 100755
--- a/scripts/download
+++ b/scripts/download
@@ -22,11 +22,7 @@ mkdir -p ${DATA_DIR}
curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf -
-if [ ${ARCH} = riscv64 ]; then
- git clone --single-branch --branch=release-1.1 --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR}
-else
- git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR}
-fi
+git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR}
git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR}