From 41d34c6d4bc2263acbca294cf892fd76925da561 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 22 Sep 2021 08:13:31 -0700 Subject: [PATCH] Correctly use custom postgres ports --- .env.dev.example | 2 +- .env.prod.example | 2 +- bookwyrm/settings.py | 2 +- docker-compose.yml | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index d4476fd24..1e4fb9812 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -16,7 +16,7 @@ DEFAULT_LANGUAGE="English" MEDIA_ROOT=images/ -POSTGRES_PORT=5432 +PGPORT=5432 POSTGRES_PASSWORD=securedbypassword123 POSTGRES_USER=fedireads POSTGRES_DB=fedireads diff --git a/.env.prod.example b/.env.prod.example index 99520916a..49729d533 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -16,7 +16,7 @@ DEFAULT_LANGUAGE="English" MEDIA_ROOT=images/ -POSTGRES_PORT=5432 +PGPORT=5432 POSTGRES_PASSWORD=securedbypassword123 POSTGRES_USER=fedireads POSTGRES_DB=fedireads diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index f2c329f01..31c2edf80 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -127,7 +127,7 @@ DATABASES = { "USER": env("POSTGRES_USER", "fedireads"), "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"), "HOST": env("POSTGRES_HOST", ""), - "PORT": env("POSTGRES_PORT", 5432), + "PORT": env("PGPORT", 5432), }, } diff --git a/docker-compose.yml b/docker-compose.yml index 5d24a4b75..afa40b05e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,6 @@ services: - pgdata:/var/lib/postgresql/data networks: - main - ports: - - 5432:5432 web: build: . env_file: .env