diff --git a/bin/remote/update_docker_images.sh b/bin/remote/update_docker_images.sh index d0f7244..2276429 100644 --- a/bin/remote/update_docker_images.sh +++ b/bin/remote/update_docker_images.sh @@ -3,25 +3,25 @@ update_docker_images(){ local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../" # 脚本文件绝对路径 - local docker_compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径 + local compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径 # 检查是否存在 docker-compose.yml 文件 - if [ ! -f $docker_compose_file ]; then + if [ ! -f $compose_file ]; then echo "Error: docker-compose.yml 文件不存在." exit 1 fi echo "正在关闭容器.." - docker compose -f $docker_compose_file down + docker compose -f $compose_file down echo "正在更新镜像.." - docker compose -f $docker_compose_file pull + docker compose -f $compose_file pull echo "正在删除未使用的镜像..." docker image prune -f echo "正在启动容器.." - docker compose -f $docker_compose_file up -d + docker compose -f $compose_file up -d } diff --git a/bin/update_docker_images.sh b/bin/update_docker_images.sh index 57ef52e..2ace306 100644 --- a/bin/update_docker_images.sh +++ b/bin/update_docker_images.sh @@ -3,24 +3,24 @@ update_docker_images(){ local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local docker_compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径 + local compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径 # 检查是否存在 docker-compose.yml 文件 - if [ ! -f $docker_compose_file ]; then + if [ ! -f $compose_file ]; then echo "Error: docker-compose.yml 文件不存在." exit 1 fi echo "正在关闭容器.." - docker compose -f $docker_compose_file down + docker compose -f $compose_file down echo "正在更新镜像.." - docker compose -f $docker_compose_file pull + docker compose -f $compose_file pull echo "正在删除未使用的镜像..." docker image prune -f echo "正在启动容器.." - docker compose -f $docker_compose_file up -d + docker compose -f $compose_file up -d } diff --git a/bin/utils/base.sh b/bin/utils/base.sh index 054a0ac..e8681fc 100644 --- a/bin/utils/base.sh +++ b/bin/utils/base.sh @@ -104,15 +104,15 @@ check_config_file(){ # 重启docker容器 restart_docker() { local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../" # 脚本文件夹绝对路径 - local docker_compose_file="$script_dir/../docker-compose.yml" + local compose_file="$script_dir/../docker-compose.yml" # 如果容器未运行,提示启动 - local running_count=$(docker compose -f $docker_compose_file ps -q | wc -l) + local running_count=$(docker compose -f $compose_file ps -q | wc -l) if [ "$running_count" -eq 0 ]; then read -p "容器未启动,是否启动容器?(y/n): " choice case "$choice" in Y|y) - docker compose -f $docker_compose_file up -d + docker compose -f $compose_file up -d return ;; *) @@ -123,8 +123,8 @@ restart_docker() { fi echo "正在重启容器..." - docker compose -f $docker_compose_file down - docker compose -f $docker_compose_file up -d + docker compose -f $compose_file down + docker compose -f $compose_file up -d } # 展示当前值并询问用户新输入的值