kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-10 17:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CHANGELOG.md and docker-compose.yml

Browse source
This commit is contained in:
Eugene Burmakin 2025-06-08 12:34:41 +02:00
parent ce43b3f1a0
commit bded0f4ad9
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CHANGELOG.md
View file

@ -8,12 +8,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## Changed ## Changed
- SolidQueue is now using PostgreSQL instead of SQLite. Provide `QUEUE_DATABASE_NAME`, `QUEUE_DATABASE_PASSWORD`, `QUEUE_DATABASE_USERNAME`, `QUEUE_DATABASE_PORT` and `QUEUE_DATABASE_HOST` environment variables to configure it. - SolidQueue is now using PostgreSQL instead of SQLite. Provide `QUEUE_DATABASE_NAME`, `QUEUE_DATABASE_PASSWORD`, `QUEUE_DATABASE_USERNAME`, `QUEUE_DATABASE_PORT` and `QUEUE_DATABASE_HOST` environment variables to configure it. #1331
- SQLite databases are now being stored in the `dawarich_sqlite_data` volume. #1361
```diff ```diff
... ...
dawarich_app: dawarich_app:
image: freikin/dawarich:latest image: freikin/dawarich:latest
container_name: dawarich_app
volumes:
- 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
... ...
restart: on-failure restart: on-failure
environment: environment:
@ -27,7 +35,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
+ QUEUE_DATABASE_HOST: dawarich_db + QUEUE_DATABASE_HOST: dawarich_db
# SQLite database paths for cache and cable databases # SQLite database paths for cache and cable databases
- QUEUE_DATABASE_PATH: /dawarich_db_data/dawarich_development_queue.sqlite3 - QUEUE_DATABASE_PATH: /dawarich_db_data/dawarich_development_queue.sqlite3
CACHE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cache.sqlite3 - CACHE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cache.sqlite3
- CABLE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cable.sqlite3
+ CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3
+ CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3
volumes:
dawarich_db_data:
+ dawarich_sqlite_data:
dawarich_shared:
dawarich_public:
dawarich_watched:
dawarich_storage:
... ...
``` ```

6
docker/docker-compose.yml
View file

@ -31,6 +31,7 @@ services:
- dawarich_watched:/var/app/tmp/imports/watched - dawarich_watched:/var/app/tmp/imports/watched
- dawarich_storage:/var/app/storage - dawarich_storage:/var/app/storage
- dawarich_db_data:/dawarich_db_data - dawarich_db_data:/dawarich_db_data
- dawarich_sqlite_data:/dawarich_sqlite_data
networks: networks:
- dawarich - dawarich
ports: ports:
@ -51,8 +52,8 @@ services:
QUEUE_DATABASE_NAME: dawarich_development_queue QUEUE_DATABASE_NAME: dawarich_development_queue
QUEUE_DATABASE_PASSWORD: password QUEUE_DATABASE_PASSWORD: password
# SQLite database paths for cache and cable databases # SQLite database paths for cache and cable databases
CACHE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cache.sqlite3 CACHE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cache.sqlite3
CABLE_DATABASE_PATH: /dawarich_db_data/dawarich_development_cable.sqlite3 CABLE_DATABASE_PATH: /dawarich_sqlite_data/dawarich_development_cable.sqlite3
MIN_MINUTES_SPENT_IN_CITY: 60 MIN_MINUTES_SPENT_IN_CITY: 60
APPLICATION_HOSTS: localhost APPLICATION_HOSTS: localhost
TIME_ZONE: Europe/London TIME_ZONE: Europe/London
@ -85,6 +86,7 @@ services:
volumes: volumes:
dawarich_db_data: dawarich_db_data:
dawarich_sqlite_data:
dawarich_shared: dawarich_shared:
dawarich_public: dawarich_public:
dawarich_watched: dawarich_watched:

3
docker/web-entrypoint.sh
View file

@ -35,6 +35,9 @@ export DATABASE_NAME
QUEUE_DATABASE_NAME=${QUEUE_DATABASE_NAME:-"${DATABASE_NAME}_queue"} QUEUE_DATABASE_NAME=${QUEUE_DATABASE_NAME:-"${DATABASE_NAME}_queue"}
export QUEUE_DATABASE_NAME export QUEUE_DATABASE_NAME
export QUEUE_DATABASE_PASSWORD export QUEUE_DATABASE_PASSWORD
export QUEUE_DATABASE_USERNAME
export QUEUE_DATABASE_PORT
export QUEUE_DATABASE_HOST
# Remove pre-existing puma/passenger server.pid # Remove pre-existing puma/passenger server.pid
rm -f $APP_PATH/tmp/pids/server.pid rm -f $APP_PATH/tmp/pids/server.pid