From 7fd3488bfc9bb0f29772a80b0605bd49ce77e3b0 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Mon, 28 Oct 2024 10:30:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0docker=20daemon.j?= =?UTF-8?q?son=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/install.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/installer/install.sh b/installer/install.sh index 610470def4..eca2e821f7 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -176,8 +176,6 @@ function install_docker() { cp docker/service/docker.service /etc/systemd/system/ chmod +x /usr/bin/docker* chmod 644 /etc/systemd/system/docker.service - log_content "启动 docker" - systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log else log_content "在线安装 docker" curl -fsSL https://resource.fit2cloud.com/get-docker-linux.sh -o get-docker.sh 2>&1 | tee -a ${CURRENT_DIR}/install.log @@ -186,13 +184,20 @@ function install_docker() { exit 1 fi sudo sh get-docker.sh 2>&1 | tee -a ${CURRENT_DIR}/install.log - log_content "启动 docker" - systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log fi docker_config_folder="/etc/docker" if [ ! -d "$docker_config_folder" ];then mkdir -p "$docker_config_folder" + cat < $docker_config_folder/daemon.json + { + "log-driver": "json-file", + "log-opts": { + "max-file": "3", + "max-size": "10m" + } + } +EOF fi docker version >/dev/null 2>&1 @@ -201,6 +206,8 @@ function install_docker() { exit 1 else log_content "docker 安装成功" + log_content "启动 docker" + systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log fi fi }