docker update

docker/Dockerfile

@@ -3,7 +3,6 @@
 # - based on ubuntu 18.04
 # - python3.6, postgresql and nginx webserver
 # - django, uwsgi
-# - required parameters: database_user, database_user_password, app_uid
 ############################################################
 
 # Set the base image to Ubuntu
@@ -12,9 +11,6 @@ ENV UBUNTU_NAME=bionic
 
 MAINTAINER Thomas Uher <thomas.uher@sisol-systems.com>
 
-ARG APP_UID
-ARG SERVE_APP_URL
-
 ENV PYTHONUNBUFFERED 1
 
 ARG DEBIAN_FRONTEND=noninteractive

docker/docker-entrypoint.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# the following environment variables are used in this script:
+# $DATABASE_NAME, $DB_USER, $DB_PASSWORD, $SERVE_APP_URL, $APP_UID
+# $ALLOWED_HOST, $DATABASE_NAME, $DB_USER and $DB_PASSWORD are used by settings.py (os.environ[])
 
 # start postgresql
 /etc/init.d/postgresql start

docker/localcosmos_private/settings.py

@@ -111,7 +111,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'localcosmos',
+        'NAME': os.environ['DATABASE_NAME'],
         'USER' : os.environ['DB_USER'],
         'PASSWORD' : os.environ['DB_PASSWORD'],
         'HOST' : 'localhost',