Skip to content

gha/containerd: Allow runc override #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vvoland merged 1 commit into from
Nov 5, 2025
Merged

gha/containerd: Allow runc override #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/release-containerd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
7 changes: 7 additions & 0 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}

Expand Down Expand Up @@ -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
}
}

Expand Down