From 3a9aaf6689bee4901b86a63e8af394791e4fc5cd Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Thu, 27 Jun 2024 22:33:34 +0900
Subject: [PATCH] [WIP] update runc (v1.2.0-rc.3)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 .github/workflows/test.yml | 10 ++++++++++
 Dockerfile                 |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3567d43436c..77765ff9484 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -186,6 +186,16 @@ jobs:
             containerd: v1.7.19
             rootlesskit: v2.3.1
             target: test-integration-rootless-port-slirp4netns
+          # <DEBUG>
+          - ubuntu: 20.04
+            containerd: v2.0.0-rc.4
+            rootlesskit: v2.3.1
+            target: test-integration-rootless
+          - ubuntu: 24.04
+            containerd: v1.6.33
+            rootlesskit: v2.3.1
+            target: test-integration-rootless
+          # </DEBUG>
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
diff --git a/Dockerfile b/Dockerfile
index 15f2f859148..6d6fa5c7b95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@
 
 # Basic deps
 ARG CONTAINERD_VERSION=v2.0.0-rc.4
-ARG RUNC_VERSION=v1.1.14
+ARG RUNC_VERSION=v1.2.0-rc.3
 ARG CNI_PLUGINS_VERSION=v1.5.1
 
 # Extra deps: Build
@@ -90,7 +90,7 @@ WORKDIR /go/src/github.com/opencontainers/runc
 RUN git checkout ${RUNC_VERSION} && \
   mkdir -p /out
 ENV CGO_ENABLED=1
-RUN GO=xx-go make static && \
+RUN GO=xx-go CC=$(xx-info)-gcc STRIP=$(xx-info)-strip make static && \
   xx-verify --static runc && cp -v -a runc /out/runc.${TARGETARCH}
 
 FROM build-base-debian AS build-bypass4netns