Merge pull request #1908 from opengb/develop

Allows env to control postgres port in SEED docker image

config/settings/docker.py

@@ -9,7 +9,7 @@
 from config.settings.common import *  # noqa
 
 # Gather all the settings from the docker environment variables
-ENV_VARS = ['POSTGRES_DB', 'POSTGRES_USER', 'POSTGRES_PASSWORD', ]
+ENV_VARS = ['POSTGRES_DB', 'POSTGRES_PORT', 'POSTGRES_USER', 'POSTGRES_PASSWORD', ]
 
 # The optional vars will set the SERVER_EMAIL information as needed
 OPTIONAL_ENV_VARS = ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_SES_REGION_NAME',
@@ -47,7 +47,7 @@
         'USER': POSTGRES_USER,
         'PASSWORD': POSTGRES_PASSWORD,
         'HOST': "db-postgres",
-        'PORT': 5432,
+        'PORT': POSTGRES_PORT,
     }
 }
 

docker-compose.local.yml

@@ -1,6 +1,7 @@
 # Docker Compose for deployment using a local registry.
 # Must set the following environment variables
 #   POSTGRES_DB
+#   POSTGRES_PORT
 #   POSTGRES_USER
 #   POSTGRES_PASSWORD
 #   SEED_ADMIN_USER
@@ -50,6 +51,7 @@ services:
       - AWS_SES_REGION_ENDPOINT
       - SERVER_EMAIL
       - POSTGRES_DB
+      - POSTGRES_PORT=5432
       - POSTGRES_USER
       - POSTGRES_PASSWORD
       # - REDIS_PASSWORD
@@ -80,6 +82,7 @@ services:
     image: 127.0.0.1:5000/seed
     environment:
       - POSTGRES_DB
+      - POSTGRES_PORT=5432
       - POSTGRES_USER
       - POSTGRES_PASSWORD
       - SECRET_KEY

docker-compose.yml

@@ -29,6 +29,7 @@ services:
       - AWS_SES_REGION_ENDPOINT
       - SERVER_EMAIL
       - POSTGRES_DB=seed
+      - POSTGRES_PORT=5432
       - POSTGRES_USER=seed
       - POSTGRES_PASSWORD=super-secret-password
       # - REDIS_PASSWORD=optional-need-to-configure-redis
@@ -53,6 +54,7 @@ services:
     command: /seed/docker/start_celery_docker.sh
     environment:
       - POSTGRES_DB=seed
+      - POSTGRES_PORT=5432
       - POSTGRES_USER=seed
       - POSTGRES_PASSWORD=super-secret-password
       # - REDIS_PASSWORD=optional-need-to-configure-redis