From 5ad66cb9517ada5a1e93828f5525ce7ff859a789 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 22 Jun 2026 11:12:44 +0100 Subject: [PATCH] start fixing local dev env --- deploy/settings_local.py | 2 +- docker/docker-compose.dev.yml | 6 ++++++ docker/docker-compose.local.yml | 8 ++++---- docker/loki-config/local-config.yaml | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/deploy/settings_local.py b/deploy/settings_local.py index 6dbee1a8..d6b823bb 100644 --- a/deploy/settings_local.py +++ b/deploy/settings_local.py @@ -128,4 +128,4 @@ CSRF_TRUSTED_ORIGINS = [ "http://localhost:8080/", ] -REMOTE_URL = "http://127.0.0.1:8000" \ No newline at end of file +REMOTE_URL = "http://127.0.0.1:8080" \ No newline at end of file diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 1b0ea3b5..8b430a06 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -17,6 +17,8 @@ services: - ../:/usr/src/app:cached # Mount the app log directory so logs are visible on the host at ./logs - ../logs:/var/log/rad + - ../../media:/usr/src/app/media + - ../../static:/usr/src/app/static worker: env_file: @@ -24,6 +26,8 @@ services: volumes: - ../:/usr/src/app:cached - ../logs:/var/log/rad + - ../../media:/usr/src/app/media + - ../../static:/usr/src/app/static entrypoint: [ "sh", @@ -39,6 +43,8 @@ services: volumes: - ../deploy/nginx/dev.conf:/etc/nginx/conf.d/default.conf:ro - ../logs:/var/log/rad:rw + - ../../media:/usr/src/app/media:ro + - ../../static:/usr/src/app/static:ro loki: image: grafana/loki:2.8.2 diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml index 0b9d74e2..9658e3de 100644 --- a/docker/docker-compose.local.yml +++ b/docker/docker-compose.local.yml @@ -23,8 +23,8 @@ services: # (Optional) keep explicit mounts for media/static/backups if you need # to override them separately; otherwise they are covered by the repo mount. - ../backups:/usr/src/app/backups - - ../media:/usr/src/app/media - - ../static:/usr/src/app/static + - ../../media:/usr/src/app/media + - ../../static:/usr/src/app/static ports: - 8000:8000 - 3459:3459 @@ -40,8 +40,8 @@ services: volumes: - ../:/usr/src/app - ../backups:/usr/src/app/backups - - ../media:/usr/src/app/media - - ../static:/usr/src/app/static + - ../../media:/usr/src/app/media + - ../../static:/usr/src/app/static env_file: - ./.env.dev.local depends_on: diff --git a/docker/loki-config/local-config.yaml b/docker/loki-config/local-config.yaml index 8b3b7b2f..d97403a0 100644 --- a/docker/loki-config/local-config.yaml +++ b/docker/loki-config/local-config.yaml @@ -12,6 +12,8 @@ ingester: chunk_idle_period: 5m chunk_retain_period: 30s max_transfer_retries: 0 + wal: + dir: /loki/wal schema_config: configs: