diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 75c7598..470186b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -12,7 +12,6 @@ jobs: APT_CACHER_NG: http://192.168.88.14:3142 DB_DRIVER: postgresql DB_HOST: postgres - DB_PORT: '5432' DB_NAME: calminer_test DB_USER: calminer DB_PASSWORD: calminer_password @@ -62,11 +61,11 @@ jobs: - name: Run tests env: DATABASE_DRIVER: postgresql+psycopg2 - DATABASE_HOST: ${ { env.DB_HOST } } - DATABASE_PORT: ${ { env.DB_PORT } } - DATABASE_USER: ${ { env.DB_USER } } - DATABASE_PASSWORD: ${ { env.DB_PASSWORD } } - DATABASE_NAME: ${ { env.DB_NAME } } + DATABASE_HOST: postgres + DATABASE_PORT: 5432 + DATABASE_USER: calminer + DATABASE_PASSWORD: calminer_password + DATABASE_NAME: calminer_test run: | pytest tests/ --cov=. diff --git a/Dockerfile b/Dockerfile index 0fae805..2565f21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ ARG PYTHON_VERSION=3.11-slim ARG APT_CACHE_URL=http://192.168.88.14:3142 -ARG UVICORN_WORKERS=4 -ARG UVICORN_PORT=8003 FROM python:${PYTHON_VERSION} AS builder ARG APT_CACHE_URL @@ -108,6 +106,6 @@ RUN chown -R appuser:app /app USER appuser -EXPOSE 8000 +EXPOSE 8003 -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "${UVICORN_PORT}", "--workers", "${UVICORN_WORKERS}"] +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8003", "--workers", "4"]