From 334b0629b0b4aefeb9e8126891ee0ee61fe1ff5d Mon Sep 17 00:00:00 2001 From: Olia Lisa Date: Wed, 10 Jun 2026 14:20:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5dock?= =?UTF-8?q?er-compose=E6=96=87=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/docker.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/bin/docker.sh b/bin/docker.sh index b36c88f..10d71b8 100644 --- a/bin/docker.sh +++ b/bin/docker.sh @@ -4,6 +4,7 @@ restart_docker() { local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local COMPOSE_FILE="$SCRIPT_DIR/../docker-compose.yml" + check_docker_compose_file $COMPOSE_FILE # 如果容器未运行,提示启动 local RUNNING_COUNT=$(docker compose -f $COMPOSE_FILE ps -q | wc -l) @@ -30,12 +31,7 @@ restart_docker() { update_docker_images(){ local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local COMPOSE_FILE="$SCRIPT_DIR/../docker-compose.yml" # docker-compose.yml文件路径 - - # 检查是否存在 docker-compose.yml 文件 - if [ ! -f $COMPOSE_FILE ]; then - echo "Error: docker-compose.yml 文件不存在." - exit 1 - fi + check_docker_compose_file $COMPOSE_FILE echo "正在关闭容器.." docker compose -f $COMPOSE_FILE down @@ -56,6 +52,7 @@ run() { local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local COMPOSE_FILE="$SCRIPT_DIR/../docker-compose.yml" + check_docker_compose_file $COMPOSE_FILE # 如果容器已经启动, 则先停止容器 if docker compose -f "$COMPOSE_FILE" ps | grep -q "Up"; then @@ -75,3 +72,12 @@ check_docker_compose(){ exit 1 fi } + +check_docker_compose_file(){ + local COMPOSE_FILE=${1} + # 检查是否存在 docker-compose.yml 文件 + if [ ! -f $COMPOSE_FILE ]; then + echo "Error: docker-compose.yml 文件不存在." + exit 1 + fi +} \ No newline at end of file