fix docker file

This commit is contained in:
Kevin
2026-05-25 11:39:38 +08:00
parent 07979bfb09
commit 10d9e13f14
2 changed files with 9 additions and 6 deletions

View File

@@ -24,17 +24,20 @@ WORKDIR /app
COPY pyproject.toml uv.lock ./
RUN uv sync --frozen --no-dev --no-install-project
# 复制应用代码
# 复制应用代码并在镜像内安装项目(避免运行时 uv run 重新 sync 拉 dev 依赖)
COPY . .
RUN uv sync --frozen --no-dev
# 非 root 用户
RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app
USER appuser
ENV PATH="/app/.venv/bin:$PATH"
EXPOSE 8000
HEALTHCHECK --interval=15s --timeout=5s --start-period=120s --retries=6 \
CMD python -c "import http.client; conn = http.client.HTTPConnection('localhost', 8000); conn.request('GET', '/health'); r = conn.getresponse(); exit(0 if r.status == 200 else 1)" || exit 1
# Alembic 迁移放到 FastAPI startup带重试与日志入口仅启动 web 进程。
CMD ["sh", "-c", "uv run uvicorn main:app --host 0.0.0.0 --port 8000"]
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

View File

@@ -104,7 +104,7 @@ services:
dockerfile: Dockerfile
image: life-echo-api:latest
container_name: life-echo-celery-worker
command: uv run celery -A app.tasks.celery_app worker --loglevel=info --concurrency=4 -Q celery,memory_idle
command: celery -A app.tasks.celery_app worker --loglevel=info --concurrency=4 -Q celery,memory_idle
env_file:
- .env
environment:
@@ -121,7 +121,7 @@ services:
api:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "uv run celery -A app.tasks.celery_app inspect ping --timeout 10 2>/dev/null | grep -q pong || exit 1"]
test: ["CMD-SHELL", "celery -A app.tasks.celery_app inspect ping --timeout 10 2>/dev/null | grep -q pong || exit 1"]
interval: 30s
timeout: 15s
retries: 3
@@ -140,7 +140,7 @@ services:
dockerfile: Dockerfile
image: life-echo-api:latest
container_name: life-echo-celery-beat
command: uv run celery -A app.tasks.celery_app beat --loglevel=info
command: celery -A app.tasks.celery_app beat --loglevel=info
env_file:
- .env
environment:
@@ -171,7 +171,7 @@ services:
image: life-echo-api:latest
container_name: life-echo-flower
command: >
sh -c 'uv run celery -A app.tasks.celery_app flower --port=5555
sh -c 'celery -A app.tasks.celery_app flower --port=5555
--basic_auth=$${FLOWER_USER:-admin}:$${FLOWER_PASSWORD:-changeme}'
ports:
- "127.0.0.1:${FLOWER_HOST_PORT:-5555}:5555"