From 2379022f7f87de89877a6b1caa3bda9b9cac467d Mon Sep 17 00:00:00 2001 From: Olia Lisa Date: Wed, 10 Jun 2026 14:15:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=81=E7=A7=BBrun=E5=87=BD?= =?UTF-8?q?=E6=95=B0,=20=E5=88=A0=E9=99=A4run.sh=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/docker.sh | 17 +++++++++++++++++ bin/run.sh | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 bin/run.sh diff --git a/bin/docker.sh b/bin/docker.sh index eb25bc4..b36c88f 100644 --- a/bin/docker.sh +++ b/bin/docker.sh @@ -50,6 +50,23 @@ update_docker_images(){ docker compose -f $COMPOSE_FILE up -d } + +run() { + check_docker_compose + + local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local COMPOSE_FILE="$SCRIPT_DIR/../docker-compose.yml" + + # 如果容器已经启动, 则先停止容器 + if docker compose -f "$COMPOSE_FILE" ps | grep -q "Up"; then + docker compose -f "$COMPOSE_FILE" down + fi + + # 启动docker容器 + docker compose -f "$COMPOSE_FILE" up -d +} + + # 检查docker版本是否支持docker compose子命令 check_docker_compose(){ # 检查 docker compose 子命令是否可用 diff --git a/bin/run.sh b/bin/run.sh deleted file mode 100644 index e9713d3..0000000 --- a/bin/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -run() { - check_docker_compose - - local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local COMPOSE_FILE="$SCRIPT_DIR/../docker-compose.yml" - - # 如果容器已经启动, 则先停止容器 - if docker compose -f "$COMPOSE_FILE" ps | grep -q "Up"; then - docker compose -f "$COMPOSE_FILE" down - fi - - # 启动docker容器 - docker compose -f "$COMPOSE_FILE" up -d -} -