From 3b203a3556acf293cd76175d64d1846aef210d9a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 27 Jun 2024 22:33:34 +0900 Subject: [PATCH] update runc (1.2.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- hack/build-integration-canary.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a594358aee4..84c0600e543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ # Basic deps ARG CONTAINERD_VERSION=v2.0.0-rc.5 -ARG RUNC_VERSION=v1.1.15 +ARG RUNC_VERSION=v1.2.0 ARG CNI_PLUGINS_VERSION=v1.5.1 # Extra deps: Build diff --git a/hack/build-integration-canary.sh b/hack/build-integration-canary.sh index 32fdfb3d249..0396ada100e 100755 --- a/hack/build-integration-canary.sh +++ b/hack/build-integration-canary.sh @@ -28,10 +28,7 @@ readonly root # "Blacklisting" here means that any dependency which name is blacklisted will be left untouched, at the version # currently pinned in the Dockerfile. # This is convenient so that currently broken alpha/beta/RC can be held back temporarily to keep the build green - -# Currently pinned, see: -# - https://github.com/containerd/nerdctl/pull/3153 -blacklist=(runc) +blacklist=() # List all the repositories we depend on to build and run integration tests dependencies=( @@ -219,6 +216,7 @@ canary::build::integration(){ docker_args=(docker build -t test-integration --target test-integration) for dep in "${dependencies[@]}"; do + local bl="" shortname="${dep##*/}" [ "$shortname" != "plugins" ] || shortname="cni-plugins" [ "$shortname" != "fuse-overlayfs-snapshotter" ] || shortname="containerd-fuse-overlayfs"