Skip to content

Commit

Permalink
update runc (1.2.0)
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
AkihiroSuda committed Oct 22, 2024
1 parent beaa39d commit 3b203a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions hack/build-integration-canary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3b203a3

Please sign in to comment.