CI: enable bypass4netns

Depends on containerd/nerdctl PR 3724 Signed-off-by: Akihiro Suda <[email protected]>
rootless-containers · Dec 3, 2024 · f4212ee · f4212ee
1 parent 71c9906
commit f4212ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/init-host/init-host.root.d/install-nerdctl.sh b/init-host/init-host.root.d/install-nerdctl.sh
@@ -30,6 +30,19 @@ mkdir -p /root/nerdctl.tmp
 	[ "$(sha256sum SHA256SUMS | awk '{print $1}')" = "${SHASHA}" ]
 	sha256sum --check --ignore-missing SHA256SUMS
 	tar Cxzvvf /usr/local nerdctl-full-${VERSION}-linux-${arch}.tar.gz
+
+	# <TMP>
+	# https://github.com/containerd/nerdctl/pull/3724
+	(
+		snap install --classic go
+		apt-get install -y gh
+		gh repo clone containerd/nerdctl
+		cd nerdctl
+		gh pr checkout 3724
+		make
+		make install
+	)
+	# </TMP>
 )
 rm -rf /root/nerdctl.tmp
 

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