From 6546da2939fe62b8e6e30ac4d5ba19fab72fab77 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sun, 8 Jun 2025 12:43:05 +0200 Subject: [PATCH] Update compose files --- .devcontainer/docker-compose.yml | 7 +++++++ docker/docker-compose.production.yml | 9 +++++++++ docs/synology/.env | 12 ++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 49649d71..1fd2a7ac 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -23,6 +23,12 @@ services: DATABASE_USERNAME: postgres DATABASE_PASSWORD: password DATABASE_NAME: dawarich_development + # PostgreSQL database name for solid_queue + QUEUE_DATABASE_NAME: dawarich_development_queue + QUEUE_DATABASE_PASSWORD: password + # SQLite database paths for cache and cable databases + CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3 + CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3 MIN_MINUTES_SPENT_IN_CITY: 60 APPLICATION_HOSTS: localhost TIME_ZONE: Europe/London @@ -54,3 +60,4 @@ volumes: dawarich_public: dawarich_watched: dawarich_storage: + dawarich_sqlite_data: diff --git a/docker/docker-compose.production.yml b/docker/docker-compose.production.yml index d52542a3..ca5f596e 100644 --- a/docker/docker-compose.production.yml +++ b/docker/docker-compose.production.yml @@ -27,6 +27,8 @@ services: - dawarich_public:/var/app/public - dawarich_watched:/var/app/tmp/imports/watched - dawarich_storage:/var/app/storage + - dawarich_db_data:/dawarich_db_data + - dawarich_sqlite_data:/dawarich_sqlite_data networks: - dawarich ports: @@ -44,6 +46,12 @@ services: DATABASE_USERNAME: postgres DATABASE_PASSWORD: password DATABASE_NAME: dawarich_production + # PostgreSQL database name for solid_queue + QUEUE_DATABASE_NAME: dawarich_production_queue + QUEUE_DATABASE_PASSWORD: password + # SQLite database paths for cache and cable databases + CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cache.sqlite3 + CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_production_cable.sqlite3 MIN_MINUTES_SPENT_IN_CITY: 60 APPLICATION_HOSTS: localhost,::1,127.0.0.1 TIME_ZONE: Europe/London @@ -80,3 +88,4 @@ volumes: dawarich_public: dawarich_watched: dawarich_storage: + dawarich_sqlite_data: diff --git a/docs/synology/.env b/docs/synology/.env index 2eab0f4d..efa41fdf 100644 --- a/docs/synology/.env +++ b/docs/synology/.env @@ -17,9 +17,9 @@ DATABASE_HOST=dawarich_db DATABASE_USERNAME=postgres DATABASE_PASSWORD=password DATABASE_NAME=dawarich - -################################################################################### -# Redis -################################################################################### - -REDIS_URL=redis://dawarich_redis:6379/0 +# PostgreSQL database name for solid_queue +QUEUE_DATABASE_NAME=dawarich_development_queue +QUEUE_DATABASE_PASSWORD=password +# SQLite database paths for cache and cable databases +CACHE_DATABASE_PATH=/dawarich_sqlite_data/dawarich_development_cache.sqlite3 +CABLE_DATABASE_PATH=/dawarich_sqlite_data/dawarich_development_cable.sqlite3