From b517d99d411c33939a08fe19f7f820e433845407 Mon Sep 17 00:00:00 2001 From: Prashanth Mohan Date: Sun, 1 Oct 2023 15:53:39 +1100 Subject: [PATCH] Use port numbers from environment file. Allow overriding of the postgres and redis forwarded ports in the docker configuration to allow running on alternate ports where the default ports may already be in use. --- .env.example | 3 ++- docker/docker-compose.dev.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 8df547e37..713826f50 100644 --- a/.env.example +++ b/.env.example @@ -9,7 +9,8 @@ REDIS_PASSWORD= POSTGRES_DB=ghostfolio-db POSTGRES_USER=user POSTGRES_PASSWORD= +POSTGRES_PORT=5432 ACCESS_TOKEN_SALT= -DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer +DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:${POSTGRES_PORT}/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer JWT_SECRET_KEY= diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 38e38f30d..7c6e5e28a 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -7,7 +7,7 @@ services: env_file: - ../.env ports: - - 5432:5432 + - ${POSTGRES_PORT:-5432}:5432 volumes: - postgres:/var/lib/postgresql/data redis: @@ -15,7 +15,7 @@ services: container_name: redis restart: unless-stopped ports: - - 6379:6379 + - ${REDIS_PORT:-6379}:6379 volumes: postgres: