Merge branch 'develop'

stack-compose.yml

@@ -5,36 +5,36 @@ services:
     ports:
       - 8000:8000
     environment:
-      SECRET_KEY: /run/secrets/SECRET_KEY
-      TG_BOT_TOKEN: /run/secrets/TG_BOT_TOKEN
-      EMAIL_HOST: /run/secrets/EMAIL_HOST
-      EMAIL_PASSWD: /run/secrets/EMAIL_PASSWD
-      DB_NAME: /run/secrets/DB_NAME
-      DB_USER: /run/secrets/DB_USER
-      DB_PASSWORD: /run/secrets/DB_PASSWD
+      SECRET_KEY: /run/secrets/DJANGO_SECRET_KEY
+      TG_BOT_TOKEN: /run/secrets/DJANGO_TG_BOT_TOKEN
+      EMAIL_HOST: /run/secrets/DJANGO_EMAIL_HOST
+      EMAIL_PASSWD: /run/secrets/DJANGO_EMAIL_PASSWD
+      DB_NAME: /run/secrets/DJANGO_DB_NAME
+      DB_USER: /run/secrets/DJANGO_DB_USER
+      DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
       DB_HOST: 127.0.0.1
       DB_PORT: 5432
 
     secrets:
-      - SECRET_KEY
-      - TG_BOT_TOKEN
-      - EMAIL_HOST
-      - EMAIL_PASSWD
-      - DB_NAME
-      - DB_USER
-      - DB_PASSWD
+      - DJANGO_SECRET_KEY
+      - DJANGO_TG_BOT_TOKEN
+      - DJANGO_EMAIL_HOST
+      - DJANGO_EMAIL_PASSWD
+      - DJANGO_DB_NAME
+      - DJANGO_DB_USER
+      - DJANGO_DB_PASSWD
 secrets:
-  SECRET_KEY:
+  DJANGO_SECRET_KEY:
     external: true
-  TG_BOT_TOKEN:
+  DJANGO_TG_BOT_TOKEN:
     external: true
-  EMAIL_HOST:
+  DJANGO_EMAIL_HOST:
     external: true
-  EMAIL_PASSWD:
+  DJANGO_EMAIL_PASSWD:
     external: true
-  DB_NAME:
+  DJANGO_DB_NAME:
     external: true
-  DB_USER:
+  DJANGO_DB_USER:
     external: true
-  DB_PASSWD:
+  DJANGO_DB_PASSWD:
     external: true