diff --git a/docker/scripts/check-deps.sh b/docker/scripts/check-deps.sh index bbdb132..0fd50ff 100755 --- a/docker/scripts/check-deps.sh +++ b/docker/scripts/check-deps.sh @@ -4,6 +4,18 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}" export STARTUP_COMPONENT="${STARTUP_COMPONENT:-container}" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + python - <<'PY' import os diff --git a/docker/scripts/migrate.sh b/docker/scripts/migrate.sh index c9d3006..af57db2 100755 --- a/docker/scripts/migrate.sh +++ b/docker/scripts/migrate.sh @@ -4,6 +4,18 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}" export STARTUP_COMPONENT="migrate" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + /app/docker/scripts/check-deps.sh python src/manage.py migrate --noinput diff --git a/docker/scripts/start-celery-beat.sh b/docker/scripts/start-celery-beat.sh index 5b52f6b..55484fe 100755 --- a/docker/scripts/start-celery-beat.sh +++ b/docker/scripts/start-celery-beat.sh @@ -3,6 +3,18 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + exec celery -A core beat \ --loglevel="${CELERY_LOG_LEVEL:-INFO}" \ --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/docker/scripts/start-celery-worker.sh b/docker/scripts/start-celery-worker.sh index 367ea24..757bdab 100755 --- a/docker/scripts/start-celery-worker.sh +++ b/docker/scripts/start-celery-worker.sh @@ -3,6 +3,18 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + exec celery -A core worker \ --loglevel="${CELERY_LOG_LEVEL:-INFO}" \ --concurrency="${CELERY_WORKER_CONCURRENCY:-2}" diff --git a/docker/scripts/start-web-dev.sh b/docker/scripts/start-web-dev.sh index fde9d77..c11eff1 100755 --- a/docker/scripts/start-web-dev.sh +++ b/docker/scripts/start-web-dev.sh @@ -3,4 +3,16 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + exec python src/manage.py runserver "0.0.0.0:${PORT:-8000}" diff --git a/docker/scripts/start-web.sh b/docker/scripts/start-web.sh index 197215d..32a1daf 100755 --- a/docker/scripts/start-web.sh +++ b/docker/scripts/start-web.sh @@ -4,6 +4,18 @@ set -eu export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}" export STARTUP_COMPONENT="${STARTUP_COMPONENT:-web}" +case "${DJANGO_SETTINGS_MODULE}" in + config.settings.development|config.settings.dev) + export DJANGO_SETTINGS_MODULE="settings.dev" + ;; + config.settings.production) + export DJANGO_SETTINGS_MODULE="settings.production" + ;; + config.settings.test) + export DJANGO_SETTINGS_MODULE="settings.test" + ;; +esac + /app/docker/scripts/check-deps.sh python src/manage.py migrate --noinput