diff --git a/configure_priv.sh b/configure_priv.sh index 870a767..249e7b3 100755 --- a/configure_priv.sh +++ b/configure_priv.sh @@ -235,6 +235,8 @@ 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 @@ -248,17 +250,20 @@ configure_docker() { sudo chmod +x /usr/local/bin/docker-compose # 如果 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 + if [[ $EUID -ne 0 ]]; then + 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 - # 最后启动 - sudo systemctl enable docker - sudo systemctl start docker + sudo apt-get install -y uidmap + /usr/bin/dockerd-rootless-setuptool.sh install + + # 设置 linger 为 on + sudo loginctl enable-linger $USER + fi fi } diff --git a/files/docker-rootless-daemon-aboard.json b/files/docker-rootless-daemon-aboard.json index 96f99ad..c670a61 100644 --- a/files/docker-rootless-daemon-aboard.json +++ b/files/docker-rootless-daemon-aboard.json @@ -1,8 +1,4 @@ { - "registry-mirrors": [ - "https://d.nano.ac", - "https://docker-registry.infra.i2sec.cc:50001" - ], "log-driver": "json-file", "log-opts": { "max-size": "64m", diff --git a/files/docker-rootless-daemon-internal.json b/files/docker-rootless-daemon-internal.json index c670a61..96f99ad 100644 --- a/files/docker-rootless-daemon-internal.json +++ b/files/docker-rootless-daemon-internal.json @@ -1,4 +1,8 @@ { + "registry-mirrors": [ + "https://d.nano.ac", + "https://docker-registry.infra.i2sec.cc:50001" + ], "log-driver": "json-file", "log-opts": { "max-size": "64m",