修改了路径错误
This commit is contained in:
parent
9b2f67ef48
commit
49327d5d93
@ -5,7 +5,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
PROJECT_ROOT="$SCRIPT_DIR"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
# 默认环境
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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 "========================================="
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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)"
|
||||
|
||||
# 默认配置
|
||||
|
||||
@ -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 "========================================="
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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'
|
||||
|
||||
30
deploy/fix-paths.sh
Executable file
30
deploy/fix-paths.sh
Executable file
@ -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 后缀"
|
||||
@ -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)"
|
||||
|
||||
# 颜色输出
|
||||
|
||||
Loading…
Reference in New Issue
Block a user