Compare commits

..

No commits in common. "883b459202cbf9d997199ecfdd6759fb6a9b86f3" and "abde41f7c244cf531484379a953d7b0369b4a6ad" have entirely different histories.

4 changed files with 17 additions and 21 deletions

View File

@ -235,7 +235,8 @@ configure_docker() {
fi fi
sudo apt-get update sudo apt-get update
sudo apt-get install docker-ce docker-ce-cli containerd.io -y sudo apt-get install docker-ce docker-ce-cli containerd.io -y
sudo systemctl enable docker
sudo systemctl start docker
# 安装 docker-compose-plugin # 安装 docker-compose-plugin
sudo apt-get install docker-compose-plugin -y sudo apt-get install docker-compose-plugin -y
# 安装 docker-compose # 安装 docker-compose
@ -246,19 +247,6 @@ configure_docker() {
echo "Latest version of docker-compose is $latest_version" echo "Latest version of docker-compose is $latest_version"
sudo curl -L "$github/docker/compose/releases/download/$latest_version/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose 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 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
# 最后启动
sudo systemctl enable docker
sudo systemctl start docker
fi fi
} }

View File

@ -1,7 +0,0 @@
{
"log-driver": "json-file",
"log-opts": {
"max-size": "64m",
"max-file": "10"
}
}

View File

@ -3,6 +3,9 @@
"https://d.nano.ac", "https://d.nano.ac",
"https://docker-registry.infra.i2sec.cc:50001" "https://docker-registry.infra.i2sec.cc:50001"
], ],
"insecure-registries": [
"localhost:5000"
],
"log-driver": "json-file", "log-driver": "json-file",
"log-opts": { "log-opts": {
"max-size": "64m", "max-size": "64m",

View File

@ -12,3 +12,15 @@ fi
. $scriptdir/configure_priv.sh $@ . $scriptdir/configure_priv.sh $@
# ============================================================ # ============================================================
# configure_docker() {
# [ -f /etc/docker/daemon.json ] && return
# read -p "要配置 Docker 吗?[N]: " response
# if [[ $response =~ ^[Yy]$ ]]; then
# cp $scriptdir/files/docker-rootless-daemon.json /etc/docker/daemon.json
# fi
# }
# configure_docker