diff --git a/.gitignore b/.gitignore index 150e95a..79907e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .idea .env .agent -app/data/app.db +api/data/ diff --git a/Dockerfile b/Dockerfile index a456bdf..d285eeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ # 1. Build Vue Frontend ################################ FROM node:24-alpine AS frontend-builder -ENV PNPM_HOME="/pnpm" -ENV PATH="$PNPM_HOME:$PATH" WORKDIR /app/web COPY web/. ./ @@ -15,14 +13,14 @@ RUN npm install && npm run build ################################ FROM python:3.13-slim -WORKDIR /app +WORKDIR /api # 拷贝后端 COPY api/ ./ -ENV PATH="/app/.venv/bin:$PATH" +ENV PATH="/api/.venv/bin:$PATH" -# 拷贝数据目录(确保 sqlite 文件目录存在) 在容器中的数据保存目录为 /app/data +# 拷贝数据目录(确保 sqlite 文件目录存在) 在容器中的数据保存目录为 /api/data # 安装后端依赖 RUN mkdir -p data && pip install uv && uv sync diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7eb496e..913be11 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -5,10 +5,9 @@ services: container_name: archivenote-backend-dev working_dir: /app ports: - - "8000:8000" + - "2601:2601" volumes: - ./api:/app - - ./app/data:/app/data environment: - SECRET_KEY=dev-secret-key-change-in-production # - DATABASE_URL=sqlite+aiosqlite:///./data/app.db @@ -17,7 +16,7 @@ services: bash -c "pip install uv && uv sync && uv run python -m alembic upgrade head && - uv run python -m uvicorn app.app:app --host 0.0.0.0 --port 8000 --reload" + uv run python -m uvicorn app.app:app --host 0.0.0.0 --port 2601 --reload" restart: unless-stopped # 前端服务 @@ -31,7 +30,7 @@ services: - ./web:/app - /app/node_modules environment: - - VITE_API_BASE_URL=http://localhost:8000/api + - VITE_API_BASE_URL=http://localhost:2601/api command: sh -c "npm install && npm run dev -- --host" restart: unless-stopped