From 2057ec4791f662f4f8a5a252a04ede1df999ff43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Wed, 5 Nov 2025 12:45:43 +0100
Subject: [PATCH] gha/containerd: Allow runc override
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 .github/workflows/release-containerd.yml | 6 ++++++
 docker-bake.hcl                          | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/.github/workflows/release-containerd.yml b/.github/workflows/release-containerd.yml
index dd03c4bb..7b33ac19 100644
--- a/.github/workflows/release-containerd.yml
+++ b/.github/workflows/release-containerd.yml
@@ -11,6 +11,11 @@ on:
         description: 'Tag/ref to build (e.g. v1.6.15)'
         required: true
         type: string
+      runc_ref:
+        description: '(optional) Runc tag/ref to build (e.g. v1.1.10). Defaults to the containerd version.'
+        required: false
+        type: string
+        default: ''
       release:
         description: '(optional) Release type to create in https://github.com/docker/packaging/releases'
         required: false
@@ -50,4 +55,5 @@ jobs:
         PKG_REF=${{ inputs.ref }}
         PKG_DEB_REVISION=${{ inputs.revision }}
         PKG_RPM_RELEASE=${{ inputs.revision }}
+        RUNC_REF=${{ inputs.runc_ref }}
     secrets: inherit
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7f54d7e4..9714b746 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -132,6 +132,11 @@ variable "PKG_RPM_RELEASE" {
   default = null
 }
 
+variable "RUNC_REF" {
+  description = "Reference (branch, tag, commit) of runc to build. Only used for containerd package. If not set, defaults to the version specified in containerd's script/setup/runc-version file."
+  default = null
+}
+
 variable "NIGHTLY_BUILD" {
   description = "Set to 1 to enforce nightly build."
   default = null
@@ -542,6 +547,7 @@ target "_pkg-containerd" {
     GO_VERSION = GO_VERSION != null && GO_VERSION != "" ? GO_VERSION : "1.24.9" # https://github.com/containerd/containerd/blob/2d28d98490f53d78c98faecfc91f9fd54cdbc16e/.github/workflows/release.yml#L16
     GO_IMAGE_VARIANT = GO_IMAGE_VARIANT != null && GO_IMAGE_VARIANT != "" ? GO_IMAGE_VARIANT : "bookworm"
     PKG_DEB_EPOCH = PKG_DEB_EPOCH != null && PKG_DEB_EPOCH != "" ? PKG_DEB_EPOCH : ""
+    RUNC_REF = RUNC_REF != null && RUNC_REF != "" ? RUNC_REF : null
   }
 }
 
@@ -645,6 +651,7 @@ target "_common" {
     PKG_DEB_EPOCH = PKG_DEB_EPOCH
     PKG_RPM_BUILDFLAGS = PKG_RPM_BUILDFLAGS
     PKG_RPM_RELEASE = PKG_RPM_RELEASE
+    RUNC_REF = RUNC_REF
   }
 }