diff --git a/.env.dev.example b/.env.dev.example index 538d1611d..2f24378c6 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres MEDIA_ROOT=images/ +POSTGRES_PORT=5432 POSTGRES_PASSWORD=fedireads POSTGRES_USER=fedireads POSTGRES_DB=fedireads diff --git a/.env.prod.example b/.env.prod.example index ac9fe70f8..a82499a32 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres MEDIA_ROOT=images/ +POSTGRES_PORT=5432 POSTGRES_PASSWORD=securedbpassword123 POSTGRES_USER=fedireads POSTGRES_DB=fedireads diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 45d8cb9d6..d694e33fd 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -118,7 +118,7 @@ BOOKWYRM_DBS = { "USER": env("POSTGRES_USER", "fedireads"), "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"), "HOST": env("POSTGRES_HOST", ""), - "PORT": 5432, + "PORT": env("POSTGRES_PORT", 5432), }, } diff --git a/docker-compose.yml b/docker-compose.yml index 9324b224b..18f836502 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,8 +42,6 @@ services: image: redis command: ["redis-server", "--appendonly", "yes"] env_file: .env - ports: - - 6378:6378 networks: - main restart: on-failure @@ -76,7 +74,7 @@ services: restart: on-failure flower: build: . - command: flower --port=8888 + command: flower --port=${FLOWER_PORT} env_file: .env environment: - CELERY_BROKER_URL=${CELERY_BROKER}