Merge branch 'main' of http://git2.simplico.net/tum/coi

app/coi/settings.py

@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/5.1/ref/settings/
 
 from pathlib import Path
 import os
-
+from pprint import pprint
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -26,6 +26,8 @@ SECRET_KEY = "django-insecure-#td578+^qcir9s!0pb7lxh!4tefib7t&x7^p4+=5$vpvujjumn
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
+DJANGO_ENV = os.getenv("DJANGO_ENV", "dev")  # Default to 'dev' if not set
+pprint(f"ENV = {DJANGO_ENV}")
 ALLOWED_HOSTS = []
 
 
@@ -86,15 +88,28 @@ WSGI_APPLICATION = "coi.wsgi.application"
 
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
+DJANGO_ENV = os.getenv("DJANGO_ENV", "dev")  # Default to 'dev' if not set
+if DJANGO_ENV == "dev":
+    DB_NAME = os.environ.get('DB_NAME', 'coi_db')
+    DB_USER =  os.environ.get('DB_USER', 'sa')
+    DB_PASSWORD = os.environ.get('DB_PASSWORD', '')
+    DB_HOST =  os.environ.get('DB_HOST', 'db')
+    DB_PORT = os.environ.get('DB_PORT', '1433')
+else:
+    DB_NAME = "coi_db"
+    DB_USER =  "user1"
+    DB_PASSWORD = "1234"
+    DB_HOST =  "192.168.0.253"
+    DB_PORT = '1433'
 
 DATABASES = {
     'default': {
         'ENGINE': 'mssql',
-        'NAME': os.environ.get('DB_NAME', 'coi_db'),
-        'USER': os.environ.get('DB_USER', 'sa'),
-        'PASSWORD': os.environ.get('DB_PASSWORD', ''),
-        'HOST': os.environ.get('DB_HOST', 'db'),
-        'PORT': os.environ.get('DB_PORT', '1433'),
+        'NAME': DB_NAME,
+        'USER': DB_USER,
+        'PASSWORD': DB_PASSWORD,
+        'HOST': DB_HOST,
+        'PORT': DB_PORT,
         'OPTIONS': {
             'driver': 'ODBC Driver 18 for SQL Server',
             'extra_params':  'Encrypt=no',
@@ -103,10 +118,10 @@ DATABASES = {
     'OB2011DB': {
         'ENGINE': 'mssql',
         'NAME': 'OB2011DB',
-        'USER': os.environ.get('DB_USER', 'sa'),
-        'PASSWORD': os.environ.get('DB_PASSWORD', ''),
-        'HOST': os.environ.get('DB_HOST', 'db'),
-        'PORT': os.environ.get('DB_PORT', '1433'),
+        'USER': DB_USER,
+        'PASSWORD': DB_PASSWORD,
+        'HOST': DB_HOST,
+        'PORT': DB_PORT,
         'OPTIONS': {
             'driver': 'ODBC Driver 18 for SQL Server',
             'extra_params':  'Encrypt=no',

docker-compose.yml

@@ -35,6 +35,7 @@ services:
         condition: service_started
         #condition: service_healthy
     environment:
+      DJANGO_ENV: "dev"
       DB_NAME: "coi_db"
       DB_USER: "sa"
       DB_PASSWORD: "StrongPassw0rd!"