Compare commits

...

3 commits

Author SHA1 Message Date
f2222593a3 Merge pull request 'fix: DB port 5888→5433 (port conflict)' (#3) from quality-program-2026-04-12 into main
Some checks are pending
Static Analysis / static (push) Waiting to run
Tests / test (push) Waiting to run
2026-04-18 12:43:57 +00:00
David Kiania
152fce81a8 fix: point DATABASE_URL at timescale_db container (not legacy 31.97.44.246:5888)
Some checks failed
Static Analysis / static (push) Waiting to run
Tests / test (push) Waiting to run
Static Analysis / static (pull_request) Has been cancelled
Tests / test (pull_request) Has been cancelled
Ingest scripts were connecting to the old tracksolid_2 database instead of
the timescale_db container in this stack. Grafana was already correct
(uses service name timescale_db:5432). Also strip leading space and quotes
from DATABASE_URL and API_BASE_URL so os.getenv() returns clean values.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-18 15:43:49 +03:00
David Kiania
07ef491695 fix: change DB host port 5888→5433 (5888 already allocated by legacy DB)
Some checks failed
Static Analysis / static (push) Waiting to run
Tests / test (push) Waiting to run
Static Analysis / static (pull_request) Has been cancelled
Tests / test (pull_request) Has been cancelled
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-18 14:19:20 +03:00
2 changed files with 3 additions and 3 deletions

4
.env
View file

@ -8,10 +8,10 @@ TRACKSOLID_PWD_MD5=81a1b005efd3596073e38efd8a2fd3fd
POSTGRES_DB=tracksolid_db
POSTGRES_USER=postgres
POSTGRES_PASSWORD=U1pm3f5SX34DXkHoW6aKFsBHOlMA9binDPNG4aT0FAcg7AubEvYm0e6kU2dZiYrR
DATABASE_URL= "postgres://postgres:U1pm3f5SX34DXkHoW6aKFsBHOlMA9binDPNG4aT0FAcg7AubEvYm0e6kU2dZiYrR@31.97.44.246:5888/tracksolid_db"
DATABASE_URL=postgres://postgres:U1pm3f5SX34DXkHoW6aKFsBHOlMA9binDPNG4aT0FAcg7AubEvYm0e6kU2dZiYrR@timescale_db:5432/tracksolid_db
# Grafana
GRAFANA_ADMIN_PASSWORD=ed3aaf20707fb5af9185708ec27f5211f71b35067277993eab624abce1
GRAFANA_DB_RO_PASSWORD=7942a1DeLgyuiCzh8XFH21sPVJqRJo737qDW1PNDEtM
API_BASE_URL = "https://eu-open.tracksolidpro.com/route/rest"
API_BASE_URL=https://eu-open.tracksolidpro.com/route/rest

View file

@ -7,7 +7,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
ports:
- "5888:5432"
- "5433:5432"
volumes:
- timescale-data:/var/lib/postgresql/data
healthcheck: