django et compose opé

DjangoFiles/TiBillet/settings.py

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/3.1/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
-
+import os
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -20,12 +20,16 @@ BASE_DIR = Path(__file__).resolve(strict=True).parent.parent
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'xvpvye-st)659v9x)$ypt16#iof8rh&*04v#nryi@n+u)(d@9v'
+SECRET_KEY = os.environ.get('DJANGO_SECRET')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+# noinspection DjangoDebugModeSettings
+if os.environ.get('DEBUG_DJANGO') == "True":
+    DEBUG = True
+else:
+    DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition
@@ -75,8 +79,12 @@ WSGI_APPLICATION = 'TiBillet.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django_tenants.postgresql_backend',  # Add 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': os.environ.get('POSTGRES_DB'),
+        'USER': os.environ.get('POSTGRES_USER'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+        'HOST': os.environ.get('POSTGRES_HOST'),
+        'PORT': os.environ.get('POSTGRES_PORT', '5432'),
     }
 }
 

DjangoFiles/launch.sh

@@ -0,0 +1 @@
+sleep 36d

Docker/Development/docker-compose.yml

@@ -1,10 +1,11 @@
 version: '3.7'
 services:
   tibillet_postgres:
+    container_name: tibillet_postgres
     image: postgres:11.5-alpine
     restart: always
     volumes:
-      - "../Postgres/dbdata:/var/lib/postgresql/data"
+      - "../../Postgres/dbdata:/var/lib/postgresql/data"
       - "/etc/localtime:/etc/localtime:ro"
     environment:
       POSTGRES_USER: ${POSTGRES_USER}
@@ -13,14 +14,15 @@ services:
 
 
   tibillet_django:
+    container_name: tibillet_django
     build: ../Dockerfile/
     restart: always
     env_file: .env
     ports:
       - 8002:8002
     volumes:
-      - "../DjangoFiles:/DjangoFiles"
-      - "../Docker/bashrc:/root/.bashrc"
+      - "../../DjangoFiles:/DjangoFiles"
+      - "../../Docker/bashrc:/root/.bashrc"
     working_dir: /DjangoFiles
     command: "bash /DjangoFiles/launch.sh"
     depends_on:

Docker/Development/env_example

@@ -1,20 +1,20 @@
 # CHANGE ME
-DJANGO_SECRET = 'ingeci8ar6Ahr6aiBi!ghovezahs@eiNgai4eingaa1zaeRi7E'
+DJANGO_SECRET='ingeci8ar6Ahr6aiBi!ghovezahs@eiNgai4eingaa1zaeRi7E'
 
-POSTGRES_HOST = 'ticket_postgres'
-POSTGRES_USER = 'ticket_postgres_user'
-POSTGRES_PASSWORD = 'ticket_postgres_password'
-POSTGRES_DB = 'ticket'
+POSTGRES_HOST='tibillet_postgres'
+POSTGRES_USER='tibillet_postgres_user'
+POSTGRES_PASSWORD='tibillet_postgres_password'
+POSTGRES_DB='tibillet'
 
-DEBUG_DJANGO = True
-TIME_ZONE = 'Indian/Reunion'
+DEBUG_DJANGO=True
+TIME_ZONE='Indian/Reunion'
 
-DOMAIN= 'tibillet-local.me'
-EMAIL= 'me@me.me'
+DOMAIN='tibillet-local.me'
+EMAIL='me@me.me'
 
-EMAIL_HOST = ""
-EMAIL_PORT = ""
-EMAIL_HOST_USER = ""
-EMAIL_HOST_PASSWORD = ""
+EMAIL_HOST=""
+EMAIL_PORT=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
 
 MOLLIE_API_KEY = ""