Browse Source

Define devproject name only in compose (#984)

Einar Forselv 7 years ago
parent
commit
705533a572
4 changed files with 5 additions and 3 deletions
  1. 2 0
      docker-compose.yaml
  2. 1 1
      extras/createdevproject.py
  3. 1 1
      extras/createsuperuser.py
  4. 1 1
      initdev

+ 2 - 0
docker-compose.yaml

@@ -13,6 +13,8 @@ services:
     build: .
     command: python manage.py runserver 0.0.0.0:8000
     environment:
+      # Name of development project
+      - PROJECT_NAME=devproject
       # Postgres
       - POSTGRES_USER=misago
       - POSTGRES_PASSWORD=misago

+ 1 - 1
extras/createdevproject.py

@@ -12,7 +12,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 def main():
-    project_name = 'devproject'
+    project_name = os.environ['PROJECT_NAME']
 
     # Allow for overriding project name
     if len(sys.argv) > 1:

+ 1 - 1
extras/createsuperuser.py

@@ -5,7 +5,7 @@ Create superuser for the devproject
 import os
 import django
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'devproject.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = '{}.settings'.format(os.environ['PROJECT_NAME'])
 django.setup()
 
 from django.contrib.auth import get_user_model

+ 1 - 1
initdev

@@ -3,7 +3,7 @@
 python setup.py develop
 
 # Create new project
-python extras/createdevproject.py devproject /srv/misago
+python extras/createdevproject.py $PROJECT_NAME /srv/misago
 
 # Clean up unnecessary project files
 rm -rf theme