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

This commit is contained in:
kianiadee 2026-04-18 12:43:57 +00:00
commit f2222593a3
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_DB=tracksolid_db
POSTGRES_USER=postgres POSTGRES_USER=postgres
POSTGRES_PASSWORD=U1pm3f5SX34DXkHoW6aKFsBHOlMA9binDPNG4aT0FAcg7AubEvYm0e6kU2dZiYrR 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
GRAFANA_ADMIN_PASSWORD=ed3aaf20707fb5af9185708ec27f5211f71b35067277993eab624abce1 GRAFANA_ADMIN_PASSWORD=ed3aaf20707fb5af9185708ec27f5211f71b35067277993eab624abce1
GRAFANA_DB_RO_PASSWORD=7942a1DeLgyuiCzh8XFH21sPVJqRJo737qDW1PNDEtM 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_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
ports: ports:
- "5888:5432" - "5433:5432"
volumes: volumes:
- timescale-data:/var/lib/postgresql/data - timescale-data:/var/lib/postgresql/data
healthcheck: healthcheck: