移除 run.sh 中对 jq 安装的检查,简化脚本逻辑
This commit is contained in:
parent
962243851c
commit
1dffa963e2
@ -4,13 +4,6 @@
|
|||||||
run() {
|
run() {
|
||||||
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径
|
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径
|
||||||
|
|
||||||
local config_dir=$(readlink -f "$script_dir/../config")
|
|
||||||
|
|
||||||
source "$script_dir/utils/base.sh"
|
|
||||||
|
|
||||||
# 检查jq是否安装
|
|
||||||
check_jq
|
|
||||||
|
|
||||||
# 如果容器已经启动, 则先停止容器
|
# 如果容器已经启动, 则先停止容器
|
||||||
local compose_file="$script_dir/../docker-compose.yml"
|
local compose_file="$script_dir/../docker-compose.yml"
|
||||||
if docker-compose -f "$compose_file" ps | grep -q "Up"; then
|
if docker-compose -f "$compose_file" ps | grep -q "Up"; then
|
||||||
@ -19,7 +12,6 @@ run() {
|
|||||||
|
|
||||||
# 启动docker容器
|
# 启动docker容器
|
||||||
docker-compose -f "$script_dir/../docker-compose.yml" up -d
|
docker-compose -f "$script_dir/../docker-compose.yml" up -d
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run # 启动容器
|
run # 启动容器
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user