From 60b2c18b3727c6f3445279fc75aeba4011c26736 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 6 Aug 2024 10:32:00 +0200 Subject: [PATCH] verify: remove workaround for containerd-shim 1.6's missing "-v" flag The containerd-shim binary that's shipped with containerd 1.6 did not provide a `-v` flag to show the version, so f1f6f220e6f6070f8e481d7b60101816526f8bf8 used `--help` as alternative. Now that we package containerd 1.7, we can use the `-v` flag instead; containerd-shim -v containerd-shim Version: 1.7.19 Revision: 2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41 Go version: go1.21.12 Signed-off-by: Sebastiaan van Stijn --- verify | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/verify b/verify index 9371154a65..362ff37b08 100755 --- a/verify +++ b/verify @@ -33,9 +33,7 @@ function verify_binaries() { docker-proxy --version containerd --version ctr --version - # containerd-shim v1.6.x does not have a -v flag. - # TODO(thaJeztah): use -v once we switch to containerd 1.7 (see https://github.com/containerd/containerd/pull/6495) - containerd-shim --help + containerd-shim -v containerd-shim-runc-v1 -v containerd-shim-runc-v2 -v runc --version