diff --git a/scripts/deploy_docker.sh b/scripts/deploy_docker.sh index c97c82c..3c998f9 100644 --- a/scripts/deploy_docker.sh +++ b/scripts/deploy_docker.sh @@ -7,19 +7,22 @@ TAG="$ENV_NAME" PORT="${PORT:-8077}" cd "$ROOT_DIR" ENV_FILE_OVERRIDE="${2:-}" +ENV_FILE="" if [ -n "$ENV_FILE_OVERRIDE" ]; then - ENV_FILE="$ENV_FILE_OVERRIDE" + if [ -f "$ENV_FILE_OVERRIDE" ]; then + ENV_FILE="$ENV_FILE_OVERRIDE" + else + echo "警告:指定的 env 文件不存在:$ENV_FILE_OVERRIDE,忽略 --env-file" >&2 + fi else - ENV_FILE=".env.$ENV_NAME" - if [ ! -f "$ENV_FILE" ] && [ -f "server/.env.$ENV_NAME" ]; then + if [ -f ".env.$ENV_NAME" ]; then + ENV_FILE=".env.$ENV_NAME" + elif [ -f "server/.env.$ENV_NAME" ]; then ENV_FILE="server/.env.$ENV_NAME" fi fi -if [ ! -f "$ENV_FILE" ]; then - echo "$ENV_FILE not found" >&2 - echo "请创建 .env.$ENV_NAME 或指定第二个参数为 env 文件路径" >&2 - echo "示例:server/.env.example" >&2 - exit 1 +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 @@ -36,14 +39,26 @@ if [ ! -f "$CONFIG_PATH" ]; then echo "配置文件缺失:$CONFIG_PATH" >&2 exit 1 fi -docker run -d \ - --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" +if [ -n "$ENV_FILE" ]; then + docker run -d \ + --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" +else + docker run -d \ + --name "$CID_NAME" \ + --restart unless-stopped \ + --env APP_ENV="$ENV_NAME" \ + -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"