From c0cc60031b97338e57baf4aee8c840799c47a3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 20 Jan 2023 16:23:46 +0100
Subject: [PATCH] add caddy, move timetracked to the main one

---
 .env               |  4 +++-
 docker-compose.yml | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 36b0b97..620ae38 100644
--- a/.env
+++ b/.env
@@ -38,4 +38,6 @@ GITEA_INTERNAL_PORT=3002
 UPTIME_KUMA_EXTERNAL_PORT=3004
 UPTIME_KUMA_INTERNAL_PORT=3001
 LOGSEQ_INTERNAL_PORT=80
-LOGSEQ_EXTERNAL_PORT=3005
\ No newline at end of file
+LOGSEQ_EXTERNAL_PORT=3005
+DENDRON_NOTES_EXTERNAL_PORT=2020
+DENDRON_NOTES_INTERNAL_PORT=2020
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 50c4ac8..25cd984 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,3 +16,37 @@ services:
     container_name: logseq
     ports:
       - "${LOGSEQ_EXTERNAL_PORT}:${LOGSEQ_INTERNAL_PORT}"
+
+  caddy:
+    image: caddy
+    container_name: caddy
+    ports:
+      - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}"
+      - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}"
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/caddy/data:/data"
+      - "${DOCKER_STORAGE_PATH}/caddy/config:/config"
+      - "${DOCKER_STORAGE_PATH}/caddy/Caddyfile:/etc/caddy/Caddyfile"
+      - "${DOCKER_STORAGE_PATH}/caddy/srv:/srv"
+      - "/www/notes:/srv/notes"
+      - "timetracker-static:/srv/timetracker"
+    depends_on:
+      - timetracker
+    restart: unless-stopped
+
+  timetracker:
+      image:  ${REGISTRY_URL}/timetracker
+      container_name: timetracker
+      environment:
+        - TZ=${TZ}
+        - "CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz"
+      user: ${PUID}
+      volumes:
+        - "${DOCKER_STORAGE_PATH}/timetracker/db.sqlite3:/home/timetracker/app/src/web/db.sqlite3"
+        - "timetracker-static:/home/timetracker/app/static"
+      ports:
+        - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}"
+      restart: unless-stopped
+
+volumes:
+  timetracker-static: