From e2237240f587d40acbb897f6f42edeb9980266d0 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 23 Jul 2024 14:35:02 +0900 Subject: [PATCH] dockerd-rootless-setuptool.sh: move RootlessKit smoke test `dockerd-rootless-setuptool.sh check` now skips the smoke test for running RootlessKit. Fix docker/docker-install issue 417 Signed-off-by: Akihiro Suda --- contrib/dockerd-rootless-setuptool.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/contrib/dockerd-rootless-setuptool.sh b/contrib/dockerd-rootless-setuptool.sh index bddbf187c0a1e..2dea592b2cbfd 100755 --- a/contrib/dockerd-rootless-setuptool.sh +++ b/contrib/dockerd-rootless-setuptool.sh @@ -269,13 +269,6 @@ init() { # - sysctl: "net.ipv4.ip_unprivileged_port_start" # - external binary: slirp4netns # - external binary: fuse-overlayfs - - # check RootlessKit functionality. RootlessKit will print hints if something is still unsatisfied. - # (e.g., `kernel.apparmor_restrict_unprivileged_userns` constraint) - if ! rootlesskit true; then - ERROR "RootlessKit failed, see the error messages and https://rootlesscontaine.rs/getting-started/common/ ." - exit 1 - fi } # CLI subcommand: "check" @@ -400,7 +393,16 @@ cli_ctx_rm() { # CLI subcommand: "install" cmd_entrypoint_install() { init - # requirements are already checked in init() + # Most requirements are already checked in init(), except the smoke test below for RootlessKit. + # https://github.com/docker/docker-install/issues/417 + + # check RootlessKit functionality. RootlessKit will print hints if something is still unsatisfied. + # (e.g., `kernel.apparmor_restrict_unprivileged_userns` constraint) + if ! rootlesskit true; then + ERROR "RootlessKit failed, see the error messages and https://rootlesscontaine.rs/getting-started/common/ ." + exit 1 + fi + if [ -z "$SYSTEMD" ]; then install_nonsystemd else