Docker startup: поддержка legacy DJANGO_SETTINGS_MODULE config.settings.*
- Нормализация config.settings.* -> settings.* во всех entrypoint-скриптах - Устраняет ModuleNotFoundError: No module named 'config' при старте в Dokploy
This commit is contained in:
@@ -4,6 +4,18 @@ set -eu
|
|||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-container}"
|
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'
|
python - <<'PY'
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,18 @@ set -eu
|
|||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
||||||
export STARTUP_COMPONENT="migrate"
|
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
|
/app/docker/scripts/check-deps.sh
|
||||||
|
|
||||||
python src/manage.py migrate --noinput
|
python src/manage.py migrate --noinput
|
||||||
|
|||||||
@@ -3,6 +3,18 @@ set -eu
|
|||||||
|
|
||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
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 \
|
exec celery -A core beat \
|
||||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||||
--scheduler django_celery_beat.schedulers:DatabaseScheduler
|
--scheduler django_celery_beat.schedulers:DatabaseScheduler
|
||||||
|
|||||||
@@ -3,6 +3,18 @@ set -eu
|
|||||||
|
|
||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
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 \
|
exec celery -A core worker \
|
||||||
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
--loglevel="${CELERY_LOG_LEVEL:-INFO}" \
|
||||||
--concurrency="${CELERY_WORKER_CONCURRENCY:-2}"
|
--concurrency="${CELERY_WORKER_CONCURRENCY:-2}"
|
||||||
|
|||||||
@@ -3,4 +3,16 @@ set -eu
|
|||||||
|
|
||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.dev}"
|
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}"
|
exec python src/manage.py runserver "0.0.0.0:${PORT:-8000}"
|
||||||
|
|||||||
@@ -4,6 +4,18 @@ set -eu
|
|||||||
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
export DJANGO_SETTINGS_MODULE="${DJANGO_SETTINGS_MODULE:-settings.production}"
|
||||||
export STARTUP_COMPONENT="${STARTUP_COMPONENT:-web}"
|
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
|
/app/docker/scripts/check-deps.sh
|
||||||
python src/manage.py migrate --noinput
|
python src/manage.py migrate --noinput
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user