Merge pull request #343 from AkihiroSuda/bypass4netns

CI: enable bypass4netns
rootless-containers · Dec 10, 2024 · f1d18e2 · f1d18e2
2 parents 87a30bb + 5d074cf
commit f1d18e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/init-host/init-host.root.d/install-nerdctl.sh b/init-host/init-host.root.d/install-nerdctl.sh
@@ -5,8 +5,8 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
-VERSION="2.0.1"
-SHASHA="608439147e8ec964c8083863890177709fb42b8a4d5aba00ed5c33a8205b5e8c"
+VERSION="2.0.2"
+SHASHA="148f4631fa16b5bfc70152f951d2536a1f8eb1af7c94665240c80ba0345e7cbc"
 
 arch=""
 case "$(uname -m)" in

diff --git a/init-host/init-host.rootless.sh b/init-host/init-host.rootless.sh
@@ -15,13 +15,7 @@ case "${CONTAINER_ENGINE}" in
 "nerdctl")
 	containerd-rootless-setuptool.sh install
 	containerd-rootless-setuptool.sh install-buildkit-containerd
-
-	# FIXME: bypass4netns stops working after rebooting the host
-	# > $ cat ~/.local/share/nerdctl/1935db59/containers/default/320813e981deea8eb35e422fc12ae2ce31897edf9528e20e92dd55f33f35906d/bypass4netns.log
-	# > time="2024-12-03T05:22:16Z" level=info msg="LogFilePath: /home/suda.linux/.local/share/nerdctl/1935db59/containers/default/320813e981deea8eb35e422fc12ae2ce31897edf9528e20e92dd55f33f35906d/bypass4netns.log"
-	#> time="2024-12-03T05:22:16Z" level=fatal msg="Cannot write pid file: open /run/user/1001/bypass4netns/320813e981deea8.pid: no such file or directory"
-
-	# containerd-rootless-setuptool.sh install-bypass4netnsd
+	containerd-rootless-setuptool.sh install-bypass4netnsd
 	;;
 "podman")
 	# pasta does not seem to work well