fixed a few bugs

Author: ternera

DOCKER_README.md

@@ -36,6 +36,7 @@ services:
       - "8000:8000"
     environment:
       - DJANGO_SETTINGS_MODULE=editgroups.settings.docker
+      - RUN_MIGRATIONS=true
     depends_on:
       db:
         condition: service_healthy
@@ -49,6 +50,7 @@ services:
       - .:/app
     environment:
       - DJANGO_SETTINGS_MODULE=editgroups.settings.docker
+      - C_FORCE_ROOT=true
     depends_on:
       - db
       - redis

celerybeat-schedule

@@ -2,20 +2,21 @@
 
 set -e
 
-echo "Waiting for PostgreSQL..."
+echo "Waiting for PostgreSQL"
 while ! nc -z db 5432; do
   sleep 0.1
 done
 echo "PostgreSQL started"
 
-echo "Running migrations..."
-python manage.py migrate --noinput
+if [ "$RUN_MIGRATIONS" = "true" ]; then
+  echo "Running migrations"
+  python manage.py migrate --noinput
 
-echo "Collecting static files..."
-python manage.py collectstatic --noinput
+  echo "Collecting static files"
+  python manage.py collectstatic --noinput
 
-echo "Creating superuser if it doesn't exist..."
-python manage.py shell -c "
+  echo "Creating superuser if it doesn't exist"
+  python manage.py shell -c "
 from django.contrib.auth import get_user_model
 User = get_user_model()
 if not User.objects.filter(username='admin').exists():
@@ -24,5 +25,6 @@ if not User.objects.filter(username='admin').exists():
 else:
     print('Superuser already exists')
 " || true
+fi
 
 exec "$@"

docker-compose.yml

@@ -1,11 +1,10 @@
-from .common import *
-
-DEBUG = True
-ALLOWED_HOSTS = ['*']
-
-SECRET_KEY = '20oj&tj8uaruseitlrise,tries,uirsetur36746209etus7e'
+import os
+import sys
+from types import ModuleType
 
-DATABASES = {
+secret = ModuleType('editgroups.settings.secret')
+secret.SECRET_KEY = '20oj&tj8uaruseitlrise,tries,uirsetur36746209etus7e'
+secret.DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'editgroups',
@@ -16,14 +15,20 @@
         'DISABLE_SERVER_SIDE_CURSORS': False,
     }
 }
+secret.SOCIAL_AUTH_MEDIAWIKI_KEY = 'your_mediawiki_key'
+secret.SOCIAL_AUTH_MEDIAWIKI_SECRET = 'your_mediawiki_secret'
+secret.SOCIAL_AUTH_MEDIAWIKI_URL = 'https://www.wikidata.org/w/index.php'
+secret.SOCIAL_AUTH_MEDIAWIKI_CALLBACK = 'http://localhost:8000/oauth/complete/mediawiki/'
+secret.REDIS_HOST = 'redis'
+secret.REDIS_PORT = 6379
+secret.REDIS_DB = 0
+secret.REDIS_PASSWORD = ''
+secret.REDIS_KEY_PREFIX = 'editgroups_'
 
-SOCIAL_AUTH_MEDIAWIKI_KEY = 'your_mediawiki_key'
-SOCIAL_AUTH_MEDIAWIKI_SECRET = 'your_mediawiki_secret'
-SOCIAL_AUTH_MEDIAWIKI_URL = 'https://www.wikidata.org/w/index.php'
-SOCIAL_AUTH_MEDIAWIKI_CALLBACK = 'http://localhost:8000/oauth/complete/mediawiki/'
+sys.modules['editgroups.settings.secret'] = secret
 
-REDIS_HOST = 'redis'
-REDIS_PORT = 6379
-REDIS_DB = 0
-REDIS_PASSWORD = ''
-REDIS_KEY_PREFIX = 'editgroups_'
+from .common import *
+
+DEBUG = True
+ALLOWED_HOSTS = ['*']
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))

docker-entrypoint.sh

@@ -1 +1,16 @@
-../app.py
+"""
+WSGI config for editgroups project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "editgroups.settings")
+
+application = app = get_wsgi_application()