From c531e12db69be58cccfbe10a72948b8548fe694a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Tue, 12 May 2026 20:14:56 +0200 Subject: [PATCH] timetracker: simplify conf for 1.7.0 --- docker-compose.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 46642c4..e9cd19b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,7 +135,6 @@ services: - "${DOCKER_STORAGE_PATH}/caddy/config:/config" - "/var/run/tailscale/tailscaled.sock:/var/run/tailscale/tailscaled.sock" - "/www/notes:/srv/notes" - - "timetracker-static:/srv/timetracker" - /var/run/docker.sock:/var/run/docker.sock networks: public: @@ -152,13 +151,12 @@ services: environment: - TZ=${TZ} - "CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz" - user: ${PUID} + - PUID=${PUID} + - PGID=${PGID} + - DATA_DIR=/home/timetracker/app/data volumes: - - "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3:/home/timetracker/app/db.sqlite3" - - "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3-shm:/home/timetracker/app/db.sqlite3-shm" - - "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3-wal:/home/timetracker/app/db.sqlite3-wal" + - "${DOCKER_STORAGE_PATH}/timetracker/data:/home/timetracker/app/data" - "${DOCKER_STORAGE_PATH}/timetracker/backups:/home/timetracker/app/games/fixtures/backups" - - "timetracker-static:/var/www/django/static" depends_on: - caddy networks: @@ -166,13 +164,7 @@ services: ipv4_address: 192.168.240.3 labels: caddy: tracker.${DOMAIN} - caddy.reverse_proxy: "{{ upstreams 8001 }}" - caddy.handle_path: "/static/*" - caddy.handle_path.root: "* /srv/timetracker" - caddy.handle_path.file_server: - caddy.handle: /robots.txt - caddy.handle.root: "* /srv/timetracker" - caddy.handle.file_server: + caddy.reverse_proxy: "{{ upstreams 8000 }}" restart: unless-stopped trilium: