diff --git a/deploy/deploy.sh b/deploy/deploy.sh index f994800c..3db40732 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -5,7 +5,7 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" PROJECT_ROOT="$SCRIPT_DIR" # 颜色输出 diff --git a/deploy/docker/alert-manager.sh b/deploy/docker/alert-manager.sh index 165ba913..5cfbbb8f 100755 --- a/deploy/docker/alert-manager.sh +++ b/deploy/docker/alert-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" ALERT_LOG="$PROJECT_ROOT/logs/alerts.log" ALERT_CONFIG="$SCRIPT_DIR/healthcheck.yml" diff --git a/deploy/docker/backup-restore.sh b/deploy/docker/backup-restore.sh index e8beb46b..b8ec2373 100755 --- a/deploy/docker/backup-restore.sh +++ b/deploy/docker/backup-restore.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" BACKUP_ROOT="$PROJECT_ROOT/backup" # 颜色输出 diff --git a/deploy/docker/build-frontend.sh b/deploy/docker/build-frontend.sh index e32545c2..83c8580c 100755 --- a/deploy/docker/build-frontend.sh +++ b/deploy/docker/build-frontend.sh @@ -5,8 +5,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" FRONTEND_DIR="$PROJECT_ROOT/qaup-ui" BUILD_OUTPUT="$FRONTEND_DIR/dist" diff --git a/deploy/docker/config-manager.sh b/deploy/docker/config-manager.sh index bb8e0419..81ab1c6e 100755 --- a/deploy/docker/config-manager.sh +++ b/deploy/docker/config-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" ENV_FILE="$PROJECT_ROOT/.env" ENV_TEMPLATE="$PROJECT_ROOT/.env.template" CONFIG_DIR="$PROJECT_ROOT/config" diff --git a/deploy/docker/docker-compose-manager.sh b/deploy/docker/docker-compose-manager.sh index 6a670b45..a0152371 100755 --- a/deploy/docker/docker-compose-manager.sh +++ b/deploy/docker/docker-compose-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" ENV_FILE="$PROJECT_ROOT/.env" # 默认环境 diff --git a/deploy/docker/integration-test.sh b/deploy/docker/integration-test.sh index 77073d9d..cd1a13f8 100755 --- a/deploy/docker/integration-test.sh +++ b/deploy/docker/integration-test.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" TEST_LOG="$PROJECT_ROOT/logs/integration_test_$(date +%Y%m%d_%H%M%S).log" # 颜色输出 diff --git a/deploy/docker/load-images.sh b/deploy/docker/load-images.sh index a2f9dd8b..f0ee3d53 100755 --- a/deploy/docker/load-images.sh +++ b/deploy/docker/load-images.sh @@ -6,7 +6,7 @@ set -e # 配置变量 -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" IMAGES_DIR="$SCRIPT_DIR/../offline-deploy/images" echo "=========================================" diff --git a/deploy/docker/log-manager.sh b/deploy/docker/log-manager.sh index 9ed00fa0..1e2d0435 100755 --- a/deploy/docker/log-manager.sh +++ b/deploy/docker/log-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" LOG_DIR="$PROJECT_ROOT/logs" # 颜色输出 diff --git a/deploy/docker/monitor.sh b/deploy/docker/monitor.sh index 3984b750..647caa1e 100755 --- a/deploy/docker/monitor.sh +++ b/deploy/docker/monitor.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" ENV_FILE="$PROJECT_ROOT/.env" # 颜色输出 diff --git a/deploy/docker/ops-manager.sh b/deploy/docker/ops-manager.sh index ca9e9cdf..ac4c3913 100755 --- a/deploy/docker/ops-manager.sh +++ b/deploy/docker/ops-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 颜色输出 RED='\033[0;31m' diff --git a/deploy/docker/performance-tuning.sh b/deploy/docker/performance-tuning.sh index 200e4d5a..f3939ab0 100755 --- a/deploy/docker/performance-tuning.sh +++ b/deploy/docker/performance-tuning.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 颜色输出 RED='\033[0;31m' diff --git a/deploy/docker/postgres/db-manager.sh b/deploy/docker/postgres/db-manager.sh index c2b8084a..718019c2 100644 --- a/deploy/docker/postgres/db-manager.sh +++ b/deploy/docker/postgres/db-manager.sh @@ -5,7 +5,7 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 默认配置 diff --git a/deploy/docker/prepare-offline-images.sh b/deploy/docker/prepare-offline-images.sh index 65ea4834..257d3493 100755 --- a/deploy/docker/prepare-offline-images.sh +++ b/deploy/docker/prepare-offline-images.sh @@ -68,8 +68,8 @@ if ! docker info &> /dev/null; then fi # 配置变量 -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" IMAGES_DIR="$PROJECT_ROOT/offline-deploy/images" CONFIG_DIR="$PROJECT_ROOT/offline-deploy/config" SCRIPTS_DIR="$PROJECT_ROOT/offline-deploy/scripts" @@ -160,7 +160,7 @@ pull_image "$MAVEN_IMAGE" # 构建自定义镜像 echo "构建 QAUP 应用镜像..." cd "$PROJECT_ROOT" -if docker build -t $QAUP_APP_IMAGE .; then +if docker build -f deploy/Dockerfile -t $QAUP_APP_IMAGE .; then echo "✓ QAUP 应用镜像构建成功" else echo "✗ QAUP 应用镜像构建失败" @@ -234,7 +234,7 @@ cat > "$SCRIPTS_DIR/load-images.sh" << 'EOF' set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" IMAGES_DIR="$SCRIPT_DIR/../images" echo "=========================================" diff --git a/deploy/docker/secrets-manager.sh b/deploy/docker/secrets-manager.sh index 9d4fa5af..75a3c848 100755 --- a/deploy/docker/secrets-manager.sh +++ b/deploy/docker/secrets-manager.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" SECRETS_DIR="$PROJECT_ROOT/secrets" ENV_FILE="$PROJECT_ROOT/.env" diff --git a/deploy/docker/security-setup.sh b/deploy/docker/security-setup.sh index 45555225..6cd0f44f 100755 --- a/deploy/docker/security-setup.sh +++ b/deploy/docker/security-setup.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 颜色输出 RED='\033[0;31m' diff --git a/deploy/docker/update-image-versions.sh b/deploy/docker/update-image-versions.sh index 8acfec54..e86ed658 100644 --- a/deploy/docker/update-image-versions.sh +++ b/deploy/docker/update-image-versions.sh @@ -5,8 +5,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" IMAGE_VERSIONS_FILE="$SCRIPT_DIR/image-versions.env" # 颜色输出 diff --git a/deploy/docker/validate-environment.sh b/deploy/docker/validate-environment.sh index 37710852..94292c73 100755 --- a/deploy/docker/validate-environment.sh +++ b/deploy/docker/validate-environment.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" ENV_FILE="$PROJECT_ROOT/.env" # 颜色输出 diff --git a/deploy/docker/verify-versions.sh b/deploy/docker/verify-versions.sh index 30865f6e..b1fb4580 100644 --- a/deploy/docker/verify-versions.sh +++ b/deploy/docker/verify-versions.sh @@ -5,8 +5,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 颜色输出 RED='\033[0;31m' diff --git a/deploy/docker/zero-downtime-update.sh b/deploy/docker/zero-downtime-update.sh index 2cc0be3e..a9f7caeb 100755 --- a/deploy/docker/zero-downtime-update.sh +++ b/deploy/docker/zero-downtime-update.sh @@ -4,8 +4,8 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" # 颜色输出 RED='\033[0;31m' diff --git a/deploy/fix-paths.sh b/deploy/fix-paths.sh new file mode 100755 index 00000000..4baa2925 --- /dev/null +++ b/deploy/fix-paths.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# 修复所有脚本中的路径问题 + +echo "修复脚本路径问题..." + +# 修复docker目录下的脚本(除了postgres子目录和prepare-offline-images.sh) +for script in docker/*.sh; do + if [ -f "$script" ] && [ "$script" != "docker/prepare-offline-images.sh" ]; then + echo "修复: $script" + # 先检查是否还有BASH_SOURCE + if grep -q 'BASH_SOURCE\[0\]' "$script"; then + sed -i.bak 's|\${BASH_SOURCE\[0\]}|$0|g' "$script" + fi + # 修复PROJECT_ROOT路径 + sed -i.bak 's|PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"|PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"|g' "$script" + fi +done + +# 修复test-paths.sh +if [ -f "test-paths.sh" ]; then + echo "修复: test-paths.sh" + if grep -q 'BASH_SOURCE\[0\]' "test-paths.sh"; then + sed -i.bak 's|\${BASH_SOURCE\[0\]}|$0|g' "test-paths.sh" + fi + sed -i.bak 's|PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"|PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"|g' "test-paths.sh" +fi + +echo "路径修复完成!" +echo "备份文件已保存为 .bak 后缀" \ No newline at end of file diff --git a/deploy/test-paths.sh b/deploy/test-paths.sh index 5f8d071f..eb280df8 100755 --- a/deploy/test-paths.sh +++ b/deploy/test-paths.sh @@ -5,7 +5,7 @@ set -e -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" # 颜色输出