From 2962a71e3555e4681fb78860d6efb5197a88440c Mon Sep 17 00:00:00 2001
From: Kohei Tokunaga <ktokunaga.mail@gmail.com>
Date: Tue, 24 Jan 2023 16:34:59 +0900
Subject: [PATCH] Dockerfile: Bump up nerdctl(1.1.0), CRI-O(1.26.1)

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
---
 Dockerfile                  | 6 +++---
 script/cri-o/test-legacy.sh | 2 +-
 script/cri-o/test-stargz.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a10f7347..f573091c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,10 +15,10 @@
 ARG CONTAINERD_VERSION=v1.7.0-beta.2
 ARG RUNC_VERSION=v1.1.4
 ARG CNI_PLUGINS_VERSION=v1.1.1
-ARG NERDCTL_VERSION=1.0.0
+ARG NERDCTL_VERSION=1.1.0
 
 ARG PODMAN_VERSION=v4.3.1
-ARG CRIO_VERSION=v1.25.1
+ARG CRIO_VERSION=v1.26.1
 ARG CONMON_VERSION=v2.1.5
 ARG COMMON_VERSION=v0.49.2
 ARG CRIO_TEST_PAUSE_IMAGE_NAME=registry.k8s.io/pause:3.6
@@ -27,7 +27,7 @@ ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
 ARG SLIRP4NETNS_VERSION=v1.1.12
 
 # Used in CI
-ARG CRI_TOOLS_VERSION=v1.25.0
+ARG CRI_TOOLS_VERSION=v1.26.0
 
 # Legacy builder that doesn't support TARGETARCH should set this explicitly using --build-arg.
 # If TARGETARCH isn't supported by the builder, the default value is "amd64".
diff --git a/script/cri-o/test-legacy.sh b/script/cri-o/test-legacy.sh
index d274429da..2966caa34 100755
--- a/script/cri-o/test-legacy.sh
+++ b/script/cri-o/test-legacy.sh
@@ -59,7 +59,7 @@ TEST_NODE_ID=$(docker run --rm -d --privileged \
                       --tmpfs=/var/lib/stargz-store:suid \
                       "${NODE_TEST_IMAGE_NAME}")
 echo "Running node on: ${TEST_NODE_ID}"
-retry docker exec "${TEST_NODE_ID}" /go/bin/crictl stats
+retry docker exec "${TEST_NODE_ID}" /go/bin/crictl --runtime-endpoint=${CRIO_SOCK} stats
 
 # If container started successfully, varidate the runtime through CRI
 FAIL=
diff --git a/script/cri-o/test-stargz.sh b/script/cri-o/test-stargz.sh
index 74a41e4de..6fd0adf7e 100755
--- a/script/cri-o/test-stargz.sh
+++ b/script/cri-o/test-stargz.sh
@@ -168,7 +168,7 @@ docker exec "${TEST_NODE_NAME}" systemctl restart stargz-store
 docker exec "${TEST_NODE_NAME}" systemctl restart crio
 CONNECTED=
 for i in $(seq 100) ; do
-    if docker exec "${TEST_NODE_NAME}" /go/bin/crictl stats ; then
+    if docker exec "${TEST_NODE_NAME}" /go/bin/crictl --runtime-endpoint=${CRIO_SOCK} stats ; then
         CONNECTED=true
         break
     fi