Compare commits

...

2 Commits

Author SHA1 Message Date
zhouyonggao 455859dab6 fix(deploy): 改进环境文件处理逻辑并添加缺失检查
添加对环境文件存在性的检查,当文件不存在时显示警告而非直接退出
当未指定环境文件时,允许仅通过配置文件加载配置
2025-11-28 16:47:20 +08:00
zhouyonggao 0f603041d9 fix(deploy): 改进docker部署脚本的错误处理和配置检查
添加环境文件路径覆盖参数,并增强错误提示
统一docker运行命令逻辑,强制检查配置文件存在性
2025-11-28 16:46:34 +08:00
1 changed files with 23 additions and 9 deletions

View File

@ -1,18 +1,28 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
ENV_NAME="${1:-test}"
IMAGE="marketing-system-data-tool"
TAG="$ENV_NAME"
PORT="${PORT:-8077}"
cd "$ROOT_DIR"
ENV_FILE_OVERRIDE="${2:-}"
ENV_FILE=""
if [ -n "$ENV_FILE_OVERRIDE" ]; then
if [ -f "$ENV_FILE_OVERRIDE" ]; then
ENV_FILE="$ENV_FILE_OVERRIDE"
else
echo "警告:指定的 env 文件不存在:$ENV_FILE_OVERRIDE,忽略 --env-file" >&2
fi
else
if [ -f ".env.$ENV_NAME" ]; then
ENV_FILE=".env.$ENV_NAME"
if [ ! -f "$ENV_FILE" ] && [ -f "server/.env.$ENV_NAME" ]; then
elif [ -f "server/.env.$ENV_NAME" ]; then
ENV_FILE="server/.env.$ENV_NAME"
fi
if [ ! -f "$ENV_FILE" ]; then
echo "示例server/.env.example" >&2
exit 1
fi
if [ -z "$ENV_FILE" ]; then
echo "未使用 env 文件,配置仅通过 server/config.$ENV_NAME.yaml 加载" >&2
fi
docker build -t "$IMAGE:$TAG" -f Dockerfile .
mkdir -p log storage/export
@ -25,7 +35,11 @@ if docker ps -a --format '{{.Names}}' | grep -q "^${CID_NAME}$"; then
docker rm "$CID_NAME" >/dev/null 2>&1 || true
fi
CONFIG_PATH="$ROOT_DIR/server/config.$ENV_NAME.yaml"
if [ -f "$CONFIG_PATH" ]; then
if [ ! -f "$CONFIG_PATH" ]; then
echo "配置文件缺失:$CONFIG_PATH" >&2
exit 1
fi
if [ -n "$ENV_FILE" ]; then
docker run -d \
--name "$CID_NAME" \
--restart unless-stopped \
@ -41,10 +55,10 @@ else
--name "$CID_NAME" \
--restart unless-stopped \
--env APP_ENV="$ENV_NAME" \
--env-file "$ENV_FILE" \
-p "$PORT:8077" \
-v "$ROOT_DIR/storage/export:/app/storage/export" \
-v "$ROOT_DIR/log:/app/log" \
-v "$CONFIG_PATH:/app/server/config.$ENV_NAME.yaml:ro" \
"$IMAGE:$TAG"
fi
echo "container: $CID_NAME image: $IMAGE:$TAG port: $PORT"