Merge pull request containerd#4207 from AkihiroSuda/gomodjail

update gomodjail (0.1.2)

Author: AkihiroSuda

Dockerfile

@@ -40,7 +40,7 @@ ARG TINI_VERSION=v0.19.0@BINARY
 # Extra deps: Debug
 ARG BUILDG_VERSION=v0.5.2@BINARY
 # Extra deps: gomodjail
-ARG GOMODJAIL_VERSION=v0.1.1@756b1b9636c6de78984cbad1a974d930e2f0e851
+ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c
 
 # Test deps
 # Currently, the Docker Official Images and the test deps are not pinned by the hash

hack/test-integration.sh

@@ -26,13 +26,6 @@ if [[ "$(id -u)" = "0" ]]; then
   fi
 fi
 
-# This is a temporary workaround for https://github.com/AkihiroSuda/gomodjail/issues/50
-# FIXME: remove this once above has been fixed.
-if command -v nerdctl.gomodjail >/dev/null 2>&1; then
-  # We do not care that it fails or succeeds - just need gomodjail to unpack once.
-  nerdctl.gomodjail info >/dev/null 2>&1 || true
-fi
-
 readonly timeout="60m"
 readonly retries="2"
 readonly needsudo="${WITH_SUDO:-}"