diff --git a/configure_priv.sh b/configure_priv.sh index 3d6a6a5..d19313c 100755 --- a/configure_priv.sh +++ b/configure_priv.sh @@ -235,8 +235,6 @@ configure_docker() { fi sudo apt-get update sudo apt-get install docker-ce docker-ce-cli containerd.io -y - sudo systemctl enable docker - sudo systemctl start docker # 安装 docker-compose-plugin sudo apt-get install docker-compose-plugin -y @@ -249,13 +247,18 @@ configure_docker() { sudo curl -L "$github/docker/compose/releases/download/$latest_version/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose - # 还得顺便配置一下 docker rootless + # 如果 user 不是 root 的话,还得顺便配置一下 docker rootless mkdir -p ~/.config/docker if [ $abroad -eq 1 ]; then cp $scriptdir/files/docker-rootless-daemon-aboard.json ~/.config/docker/daemon.json else cp $scriptdir/files/docker-rootless-daemon-internal.json ~/.config/docker/daemon.json fi + /usr/bin/dockerd-rootless-setuptool.sh install + + # 最后启动 + sudo systemctl enable docker + sudo systemctl start docker fi }