diff --git a/bin/remote/update_docker_images.sh b/bin/remote/update_docker_images.sh index a16c5f7..d0f7244 100644 --- a/bin/remote/update_docker_images.sh +++ b/bin/remote/update_docker_images.sh @@ -12,17 +12,17 @@ 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 } -update_docker_images \ No newline at end of file +update_docker_images diff --git a/bin/run.sh b/bin/run.sh index 09eb479..415695b 100644 --- a/bin/run.sh +++ b/bin/run.sh @@ -5,11 +5,11 @@ run() { 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 + 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 compose -f "$compose_file" up -d } diff --git a/bin/update_docker_images.sh b/bin/update_docker_images.sh index 55cdcca..57ef52e 100644 --- a/bin/update_docker_images.sh +++ b/bin/update_docker_images.sh @@ -12,15 +12,15 @@ 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 0687313..d0b9e67 100644 --- a/bin/utils/base.sh +++ b/bin/utils/base.sh @@ -124,12 +124,12 @@ 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 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 ;; *) @@ -140,8 +140,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 } # 展示当前值并询问用户新输入的值 @@ -156,4 +156,4 @@ ask_update() { read -p "${prompt} [当前: ${current_value}]: " input # 用户直接回车则保留当前值,否则使用新输入 echo "${input:-$current_value}" -} \ No newline at end of file +} diff --git a/install.sh b/install.sh index 1c57b44..34d0337 100644 --- a/install.sh +++ b/install.sh @@ -88,7 +88,7 @@ main(){ ;; 7) # 停止容器 - docker-compose -f ./docker-compose.yml down + docker compose -f ./docker-compose.yml down ;; 8) # 更新镜像