10 Commits

Author SHA1 Message Date
df1c971354 Merge https://git.allucanget.biz/allucanget/calminer into feat/ci-overhaul-20251029
Some checks failed
CI / test (pull_request) Failing after 2m15s
2025-11-02 16:29:25 +01:00
3a8aef04b0 fix: update database connection details in CI workflow for consistency 2025-11-02 16:29:19 +01:00
45d746d80a Merge pull request 'fix: update UVICORN_PORT and UVICORN_WORKERS in Dockerfile for consistency' (#10) from feat/ci-overhaul-20251029 into main
Some checks failed
CI / test (push) Failing after 4m22s
Reviewed-on: #10
2025-11-02 15:59:22 +01:00
f1bc7f06b9 fix: hardcode database connection details in CI workflow for consistency
Some checks failed
CI / test (pull_request) Failing after 1m54s
2025-11-02 13:40:06 +01:00
82e98efb1b fix: remove DB_PORT variable and use hardcoded value in CI workflow for consistency
Some checks failed
CI / test (pull_request) Failing after 2m24s
2025-11-02 13:09:09 +01:00
f91349dedd Merge branch 'main' into feat/ci-overhaul-20251029
Some checks failed
CI / test (pull_request) Failing after 2m47s
2025-11-02 13:02:18 +01:00
efee50fdc7 fix: update UVICORN_PORT and UVICORN_WORKERS in Dockerfile for consistency
Some checks failed
CI / test (pull_request) Failing after 2m39s
2025-11-02 12:23:26 +01:00
e254d50c0c Merge pull request 'fix: refactor database environment variables in CI workflow for consistency' (#9) from feat/ci-overhaul-20251029 into main
Some checks failed
CI / test (push) Failing after 1m55s
Reviewed-on: #9
2025-11-02 11:21:15 +01:00
6eef8424b7 fix: update DB_PORT to be a string in CI workflow for consistency
Some checks failed
CI / test (pull_request) Failing after 2m15s
2025-11-02 11:13:45 +01:00
c1f4902cf4 fix: update UVICORN_PORT to 8003 in Dockerfile and docker-compose.yml
Some checks failed
CI / test (pull_request) Failing after 3m19s
2025-11-02 11:07:28 +01:00
3 changed files with 7 additions and 10 deletions

View File

@@ -10,9 +10,8 @@ jobs:
test:
env:
APT_CACHER_NG: http://192.168.88.14:3142
DB_DRIVER: postgresql
DB_HOST: postgres
DB_PORT: 5432
DB_DRIVER: postgresql+psycopg2
DB_HOST: 192.168.88.35
DB_NAME: calminer_test
DB_USER: calminer
DB_PASSWORD: calminer_password
@@ -61,9 +60,9 @@ jobs:
- name: Run tests
env:
DATABASE_DRIVER: postgresql+psycopg2
DATABASE_DRIVER: ${ { env.DB_DRIVER } }
DATABASE_HOST: ${ { env.DB_HOST } }
DATABASE_PORT: ${ { env.DB_PORT } }
DATABASE_PORT: 5432
DATABASE_USER: ${ { env.DB_USER } }
DATABASE_PASSWORD: ${ { env.DB_PASSWORD } }
DATABASE_NAME: ${ { env.DB_NAME } }

View File

@@ -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=8000
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"]

View File

@@ -6,7 +6,7 @@ services:
context: .
dockerfile: Dockerfile
ports:
- "8000:8000"
- "8003:8003"
environment:
- DATABASE_HOST=postgres
- DATABASE_PORT=5432