瀏覽代碼

Merge pull request #40635 from AkihiroSuda/rootless-propagation

rootless: launch rootlesskit with --propagation=rslave
Brian Goff 5 年之前
父節點
當前提交
bcc50d602f
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      contrib/dockerd-rootless.sh
  2. 2 2
      hack/dockerfile/install/rootlesskit.installer

+ 1 - 0
contrib/dockerd-rootless.sh

@@ -82,6 +82,7 @@ if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then
 		--slirp4netns-seccomp=$DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SECCOMP \
 		--disable-host-loopback --port-driver=builtin \
 		--copy-up=/etc --copy-up=/run \
+		--propagation=rslave \
 		$DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS \
 		$0 $@
 else

+ 2 - 2
hack/dockerfile/install/rootlesskit.installer

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# v0.8.0
-: ${ROOTLESSKIT_COMMIT:=ce88a431e6a7cf891ebb68b10bfc6a5724b9ae72}
+# v0.9.1
+: ${ROOTLESSKIT_COMMIT:=db9657404cd538820e9e83d90dab2a78d8b833e6}
 
 install_rootlesskit() {
 	case "$1" in