From a0e60b1b0643b8752a3475e29669c7c1ee7046a8 Mon Sep 17 00:00:00 2001 From: Konano Date: Thu, 17 Oct 2024 08:56:55 +0800 Subject: [PATCH] configure docker rootless --- configure_priv.sh | 9 +++++++++ ...aemon.json => docker-rootless-daemon-aboard.json} | 3 --- files/docker-rootless-daemon-internal.json | 7 +++++++ init_root.sh | 12 ------------ 4 files changed, 16 insertions(+), 15 deletions(-) rename files/{docker-rootless-daemon.json => docker-rootless-daemon-aboard.json} (78%) create mode 100644 files/docker-rootless-daemon-internal.json diff --git a/configure_priv.sh b/configure_priv.sh index 1d4f780..3d6a6a5 100755 --- a/configure_priv.sh +++ b/configure_priv.sh @@ -237,6 +237,7 @@ configure_docker() { 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 # 安装 docker-compose @@ -247,6 +248,14 @@ configure_docker() { 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 chmod +x /usr/local/bin/docker-compose + + # 还得顺便配置一下 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 fi } diff --git a/files/docker-rootless-daemon.json b/files/docker-rootless-daemon-aboard.json similarity index 78% rename from files/docker-rootless-daemon.json rename to files/docker-rootless-daemon-aboard.json index eaefc86..96f99ad 100644 --- a/files/docker-rootless-daemon.json +++ b/files/docker-rootless-daemon-aboard.json @@ -3,9 +3,6 @@ "https://d.nano.ac", "https://docker-registry.infra.i2sec.cc:50001" ], - "insecure-registries": [ - "localhost:5000" - ], "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 new file mode 100644 index 0000000..c670a61 --- /dev/null +++ b/files/docker-rootless-daemon-internal.json @@ -0,0 +1,7 @@ +{ + "log-driver": "json-file", + "log-opts": { + "max-size": "64m", + "max-file": "10" + } +} \ No newline at end of file diff --git a/init_root.sh b/init_root.sh index 7b9da09..2d8240a 100755 --- a/init_root.sh +++ b/init_root.sh @@ -12,15 +12,3 @@ fi . $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