Merge pull request #1097 from bcj/bcj/non-standard-ports-main

Allow BookWyrm to run on Non-Standard Ports

.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

.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

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),
     },
 }
 

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}