From 231b0e94777923a00b2896280da2aa01bcad787a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 13 Jan 2022 15:42:07 +0100 Subject: [PATCH] # Docker --- docker-compose.yml | 4 ++++ konova/settings.py | 2 +- konova/sub_settings/django_settings.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2ad08203..207fd57e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: konova: external_links: - postgis:db + - arnova-nginx-server:arnova build: . container_name: "konova-docker" command: gunicorn konova.wsgi:application --bind 0.0.0.0:8000 @@ -30,11 +31,13 @@ services: - POSTGRES_USER=konova - POSTGRES_HOST=db - REDIS_HOST=redis + - SSO_HOST=arnova # To provide a celery worker instance, we need to add the celery worker as an own service celery_worker: external_links: - postgis:db + - arnova-nginx-server:arnova build: . container_name: "konova-worker-docker" command: celery -A konova worker -l INFO @@ -50,6 +53,7 @@ services: - POSTGRES_USER=konova - POSTGRES_HOST=db - REDIS_HOST=redis + - SSO_HOST=arnova nginx: build: ./nginx diff --git a/konova/settings.py b/konova/settings.py index 38b972c8..d85c75a9 100644 --- a/konova/settings.py +++ b/konova/settings.py @@ -55,7 +55,7 @@ PAGE_SIZE_MAX = 100 PAGE_DEFAULT = 1 # SSO settings -SSO_SERVER_BASE = "http://127.0.0.1:8000/" +SSO_SERVER_BASE = f"http://{os.environ.get('SSO_HOST')}/" SSO_SERVER = f"{SSO_SERVER_BASE}sso/" SSO_PRIVATE_KEY = "CHANGE_ME" SSO_PUBLIC_KEY = "CHANGE_ME" diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py index 1bf8dc50..99080596 100644 --- a/konova/sub_settings/django_settings.py +++ b/konova/sub_settings/django_settings.py @@ -30,11 +30,12 @@ BASE_DIR = os.path.dirname( SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = [ "127.0.0.1", "localhost", + "konova", ] # Authentication settings