Skip to content

Commit ee2b00f

Browse files
authored
Merge pull request #3153 from AkihiroSuda/runc-1.2
update runc (1.2.0)
2 parents beaa39d + 3b203a3 commit ee2b00f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# Basic deps
2121
ARG CONTAINERD_VERSION=v2.0.0-rc.5
22-
ARG RUNC_VERSION=v1.1.15
22+
ARG RUNC_VERSION=v1.2.0
2323
ARG CNI_PLUGINS_VERSION=v1.5.1
2424

2525
# Extra deps: Build

hack/build-integration-canary.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ readonly root
2828
# "Blacklisting" here means that any dependency which name is blacklisted will be left untouched, at the version
2929
# currently pinned in the Dockerfile.
3030
# This is convenient so that currently broken alpha/beta/RC can be held back temporarily to keep the build green
31-
32-
# Currently pinned, see:
33-
# - https://github.com/containerd/nerdctl/pull/3153
34-
blacklist=(runc)
31+
blacklist=()
3532

3633
# List all the repositories we depend on to build and run integration tests
3734
dependencies=(
@@ -219,6 +216,7 @@ canary::build::integration(){
219216
docker_args=(docker build -t test-integration --target test-integration)
220217

221218
for dep in "${dependencies[@]}"; do
219+
local bl=""
222220
shortname="${dep##*/}"
223221
[ "$shortname" != "plugins" ] || shortname="cni-plugins"
224222
[ "$shortname" != "fuse-overlayfs-snapshotter" ] || shortname="containerd-fuse-overlayfs"

0 commit comments

Comments
 (0)