From 8a7197243b72e0626648c377a876ef634c9de514 Mon Sep 17 00:00:00 2001 From: huty Date: Tue, 13 May 2025 14:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker-tools=20=E8=87=B3?= =?UTF-8?q?=201.2.1=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-tools/docker-tools | 9 ++++++--- releases/docker-tools_v1.2.1.zip | Bin 0 -> 6308 bytes 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 releases/docker-tools_v1.2.1.zip diff --git a/docker-tools/docker-tools b/docker-tools/docker-tools index 5c605b3..dcbe61b 100755 --- a/docker-tools/docker-tools +++ b/docker-tools/docker-tools @@ -4,7 +4,7 @@ # 参数配置 ## 版本号 -VERSION=1.2.0 +VERSION=1.2.1 ## 当前的日期、日期时间 DATE=`date +%Y%m%d` DATETIME=`date +%Y%m%d`_`date +%H%M%S` @@ -355,8 +355,8 @@ stopDocker () { ## 重启 Docker restartDocker () { - stop - start + stopDocker + startDocker } ## 设置 Docker 自启动 @@ -464,6 +464,9 @@ onlyUpdateDockerCompose () { onlyEnableDockerSwarm () { echo '------------------------------ 开始启用 Docker Swarm... ------------------------------' + sed -i 's#"live-restore": true#"live-restore": false#g' /etc/docker/daemon.json + restartDocker + if [ $DOCKER_SWARM_ROLE == "manager" ]; then docker swarm init --advertise-addr $DOCKER_SWARM_MANAGER_IP fi diff --git a/releases/docker-tools_v1.2.1.zip b/releases/docker-tools_v1.2.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..96d2473959ee017757fec24f3da4a5985edd8684 GIT binary patch literal 6308 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