Bugfix/external services (#1050)

* provide a default for rabbitmq host similar to postgres

* use variable hostnames from settings instead of hard coded docker hostnames

* use bash environment variables for hosts and ports, also following the naming scheme of having an SFM_ prefix for environment variables.

* use values provided by postgres and rabbitmq environment variables, used for instance by startconsumer.py

docker/consumer/invoke_consumer.sh

@@ -2,7 +2,7 @@
 set -e
 
 sh /opt/sfm-setup/setup_reqs.sh
-appdeps.py --wait-secs 90 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --port-wait ui:8080 --file-wait /sfm-data/collection_set
+appdeps.py --wait-secs 90 --port-wait ${SFM_POSTGRES_HOST}:${SFM_POSTGRES_PORT} --file /opt/sfm-ui --port-wait ${SFM_RABBITMQ_HOST}:${SFM_RABBITMQ_PORT} --port-wait ui:8080 --file-wait /sfm-data/collection_set
 
 echo "Running consumer"
-exec gosu sfm /opt/sfm-ui/sfm/manage.py startconsumer
+exec gosu sfm /opt/sfm-ui/sfm/manage.py startconsumer

docker/ui/invoke.sh

@@ -2,7 +2,7 @@
 set -e
 
 sh /opt/sfm-setup/setup_reqs.sh
-appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672  --file-wait /sfm-data/collection_set
+appdeps.py --wait-secs 60 --port-wait ${SFM_POSTGRES_HOST}:${SFM_POSTGRES_PORT} --file /opt/sfm-ui --port-wait ${SFM_RABBITMQ_HOST}:${SFM_RABBITMQ_PORT} --file-wait /sfm-data/collection_set
 sh /opt/sfm-setup/setup_ui.sh
 
 echo "Running server"

docker/ui/invoke_runserver.sh

@@ -2,9 +2,9 @@
 set -e
 
 sh /opt/sfm-setup/setup_reqs.sh
-appdeps.py --wait-secs 60 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672 --file-wait /sfm-data/collection_set
+appdeps.py --wait-secs 60 --port-wait ${SFM_POSTGRES_HOST}:${SFM_POSTGRES_PORT} --file /opt/sfm-ui --port-wait ${SFM_RABBITMQ_HOST}:${SFM_RABBITMQ_PORT} --file-wait /sfm-data/collection_set
 sh /opt/sfm-setup/setup_ui.sh
 
 echo "Running server"
 export SFM_RUN_SCHEDULER=True
-exec gosu sfm /opt/sfm-ui/sfm/manage.py runserver 0.0.0.0:8080
+exec gosu sfm /opt/sfm-ui/sfm/manage.py runserver 0.0.0.0:8080

sfm/sfm/settings/common.py

@@ -105,18 +105,24 @@
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
+POSTGRES_HOST = env.get('SFM_POSTGRES_HOST', 'db')
+POSTGRES_PORT = env.get('SFM_POSTGRES_PORT', '5432')
+POSTGRES_DB = env.get('SFM_POSTGRES_DB', 'sfmdatabase')
+POSTGRES_USER = env.get('SFM_POSTGRES_USER', 'postgres')
+POSTGRES_PASSWORD = env.get('SFM_POSTGRES_PASSWORD')
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'sfmdatabase',
-        'USER': 'postgres',
-        'PASSWORD': env.get('POSTGRES_PASSWORD'),
-        'HOST': env.get('POSTGRES_HOST', 'db'),
-        'PORT': '5432',
+        'NAME': POSTGRES_DB,
+        'USER': POSTGRES_USER,
+        'PASSWORD': POSTGRES_PASSWORD,
+        'HOST': POSTGRES_HOST,
+        'PORT': POSTGRES_PORT,
     }
 }
 
-SCHEDULER_DB_URL = "postgresql://{USER}:{PASSWORD}@{HOST}/{NAME}".format(**DATABASES["default"])
+SCHEDULER_DB_URL = "postgresql://{USER}:{PASSWORD}@{HOST}:{PORT}/{NAME}".format(**DATABASES["default"])
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
@@ -162,8 +168,9 @@
 ACCOUNT_ADAPTER = "ui.auth.AccountAdapter"
 SOCIALACCOUNT_ADAPTER = "ui.auth.SocialAccountAdapter"
 
-RABBITMQ_HOST = env.get('SFM_RABBITMQ_HOST')
-RABBITMQ_USER = env.get('SFM_RABBITMQ_USER')
+RABBITMQ_HOST = env.get('SFM_RABBITMQ_HOST', 'mq')
+RABBITMQ_PORT = env.get('SFM_RABBITMQ_PORT', "5672")
+RABBITMQ_USER = env.get('SFM_RABBITMQ_USER', 'sfm_user')
 RABBITMQ_PASSWORD = env.get('SFM_RABBITMQ_PASSWORD')
 RABBITMQ_MANAGEMENT_PORT = env.get('SFM_RABBITMQ_MANAGEMENT_PORT', "15672")
 

sfm/sfm/settings/docker_settings.py

@@ -60,7 +60,8 @@
         },
     },
 }
-RABBITMQ_HOST = "mq"
-RABBITMQ_USER = env.get('RABBITMQ_USER')
-RABBITMQ_PASSWORD = env.get('RABBITMQ_PASSWORD')
-RABBITMQ_MANAGEMENT_PORT = env.get('RABBITMQ_MANAGEMENT_PORT', '15672')
+RABBITMQ_HOST = env.get('SFM_RABBITMQ_HOST', "mq")
+RABBITMQ_PORT = env.get('SFM_RABBITMQ_PORT', "5672")
+RABBITMQ_USER = env.get('SFM_RABBITMQ_USER', 'sfm_user')
+RABBITMQ_PASSWORD = env.get('SFM_RABBITMQ_PASSWORD')
+RABBITMQ_MANAGEMENT_PORT = env.get('SFM_RABBITMQ_MANAGEMENT_PORT', '15672')