diff --git a/bin/remote/update_docker_images.sh b/bin/remote/update_docker_images.sh index a16c5f7..f54db05 100644 --- a/bin/remote/update_docker_images.sh +++ b/bin/remote/update_docker_images.sh @@ -12,16 +12,16 @@ update_docker_images(){ fi echo "正在关闭容器.." - docker-compose -f $docker_compose_file down + docker compose -f $docker_compose_file down echo "正在更新镜像.." - docker-compose -f $docker_compose_file pull + docker compose -f $docker_compose_file pull echo "正在删除未使用的镜像..." docker image prune -f echo "正在启动容器.." - docker-compose -f $docker_compose_file up -d + docker compose -f $docker_compose_file up -d } diff --git a/bin/update_docker_images.sh b/bin/update_docker_images.sh index 0e37849..58b9c39 100644 --- a/bin/update_docker_images.sh +++ b/bin/update_docker_images.sh @@ -12,14 +12,14 @@ update_docker_images(){ fi echo "正在关闭容器.." - docker-compose -f $docker_compose_file down + docker compose -f $docker_compose_file down echo "正在更新镜像.." - docker-compose -f $docker_compose_file pull + docker compose -f $docker_compose_file pull echo "正在删除未使用的镜像..." docker image prune -f echo "正在启动容器.." - docker-compose -f $docker_compose_file up -d + docker compose -f $docker_compose_file up -d } diff --git a/bin/utils/base.sh b/bin/utils/base.sh index 2687e4a..fe21357 100644 --- a/bin/utils/base.sh +++ b/bin/utils/base.sh @@ -80,13 +80,13 @@ restart_docker() { local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../" # 脚本文件夹绝对路径 # 如果容器未运行,提示启动 - local running_count=$(docker-compose -f $script_dir/../docker-compose.yml ps -q | wc -l) + local running_count=$(docker compose -f $script_dir/../docker-compose.yml ps -q | wc -l) if [ "$running_count" -eq 0 ]; then local choice read -p "容器未启动,是否启动容器?(y/n): " choice case "$choice" in Y|y) - docker-compose -f $script_dir/../docker-compose.yml up -d + docker compose -f $script_dir/../docker-compose.yml up -d return ;; *) @@ -97,8 +97,8 @@ restart_docker() { fi echo "正在重启容器..." - docker-compose -f $script_dir/../docker-compose.yml down - docker-compose -f $script_dir/../docker-compose.yml up -d + docker compose -f $script_dir/../docker-compose.yml down + docker compose -f $script_dir/../docker-compose.yml up -d } diff --git a/install.sh b/install.sh index deda36e..28b3327 100644 --- a/install.sh +++ b/install.sh @@ -92,7 +92,7 @@ main(){ ;; 5) # 停止容器 - docker-compose -f ./docker-compose.yml down + docker compose -f ./docker-compose.yml down ;; 6) # 更新镜像