From 02eb812122c8e42a1be17d0fd8942d0532acf7a3 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 14 Nov 2022 13:48:23 +0000 Subject: [PATCH] Enable docker containing debugging --- docker/docker-compose.yml | 2 ++ manage.py | 10 ++++++++++ rad/settings.py | 2 ++ requirements.txt | 3 ++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1e14823b..068df7f7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,6 +4,7 @@ services: web: build: ./rad command: python manage.py runserver 0.0.0.0:8000 + #command: pip install -r requirements.txt volumes: - ./rad/:/usr/src/rad/ - ../rts/:/usr/src/rad/rts @@ -12,6 +13,7 @@ services: - ./static:/usr/src/static ports: - 8000:8000 + - 3459:3459 env_file: - ./.env.dev db: diff --git a/manage.py b/manage.py index 2583b5cf..2dea2ff2 100755 --- a/manage.py +++ b/manage.py @@ -1,9 +1,19 @@ #!/usr/bin/env python import os import sys +from django.conf import settings + if __name__ == "__main__": os.environ.setdefault("DJANGO_SETTINGS_MODULE", "rad.settings") + + # Set up debugger if we are running in a container + if os.environ.get('RUN_MAIN'): + if settings.DEBUG_CONTAINER: + import debugpy + print("DEBUG LISTEN") + debugpy.listen(("0.0.0.0", 3459)) + try: from django.core.management import execute_from_command_line except ImportError: diff --git a/rad/settings.py b/rad/settings.py index c0c5a270..f61a919a 100644 --- a/rad/settings.py +++ b/rad/settings.py @@ -297,6 +297,8 @@ EMAIL_USE_SSL = True ADMINS = [("Ross","ross@xkjq.uk")] +DEBUG_CONTAINER = False + try: from .settings_local import * except ImportError: diff --git a/requirements.txt b/requirements.txt index 89ff796a..20d03a36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,4 +29,5 @@ pytest-django gunicorn rich bs4 -django-htmx \ No newline at end of file +django-htmx +debugpy \ No newline at end of file