Kaneo - use a single application service instead of two (replicate Kaneo configuration)

services/kaneo/.env

@@ -4,14 +4,11 @@
 
 # Service Configuration
 SERVICE=kaneo # Service name (e.g., adguard). Used as hostname in Tailscale and for container naming (app-${SERVICE}).
-IMAGE_URL_BACKEND=ghcr.io/usekaneo/api:latest # Docker image URL from container registry (e.g., adguard/adguard-home).
-IMAGE_URL_FRONTEND=ghcr.io/usekaneo/web:latest # Docker image URL from container registry (e.g., adguard/adguard-home).
+IMAGE_URL_SERVICE=ghcr.io/usekaneo/kaneo:latest # Docker image URL from container registry (e.g., adguard/adguard-home).
 IMAGE_URL_DATABASE=postgres:16-alpine # Docker image URL from container registry (e.g., adguard/adguard-home).
 
 # Network Configuration
-# SERVICEPORT=
-SERVICEPORT_FRONTEND=5173
-SERVICEPORT_BACKEND=1337
+SERVICEPORT=5173
 SERVICEPORT_DATABASE=5432
 DNS_SERVER=9.9.9.9 # Preferred DNS server for Tailscale. Uncomment the "dns:" section in compose.yaml to enable.
 
@@ -27,7 +24,6 @@ TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_tim
 # Any Container environment variables are declared below. See https://docs.docker.com/compose/how-tos/environment-variables/
 
 # Kaneo Configuration
-KANEO_API_URL="https://kaneo.<your-tailnet>.ts.net/api"
 KANEO_CLIENT_URL="https://kaneo.<your-tailnet>.ts.net"
 
 # AUTH Configuration
@@ -39,13 +35,7 @@ DB_USERNAME=kaneo
 DB_DATABASE_NAME=kaneo
 DB_PASSWORD=
 
-# Tailscale Configuration
-TS_AUTHKEY=
-
-# Time Zone setting for containers 
-TZ=Europe/Amsterdam # See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-
 # Optional Service variables
 # PUID=1000
 
-#EXAMPLE_VAR="Environment varibale"
+#EXAMPLE_VAR="Environment variable"

services/kaneo/compose.yaml

@@ -4,8 +4,7 @@ configs:
       {"TCP":{"443":{"HTTPS":true}},
       "Web":{"$${TS_CERT_DOMAIN}:443":
           {"Handlers":{
-            "/api/":{"Proxy":"http://localhost:${SERVICEPORT_BACKEND}/api/"},
-            "/":{"Proxy":"http://localhost:${SERVICEPORT_FRONTEND}"}
+            "/":{"Proxy":"http://localhost:${SERVICEPORT}"}
           }}},
       "AllowFunnel":{"$${TS_CERT_DOMAIN}:443":false}}
 
@@ -70,11 +69,11 @@ services:
       start_period: 30s # Time to wait before starting health checks
     restart: unless-stopped
 
-  # ${SERVICE} - Backend (API)
-  backend:
-    image: ${IMAGE_URL_BACKEND} # Image to be used
+  # ${SERVICE}
+  kaneo:
+    image: ${IMAGE_URL_SERVICE} # Image to be used
     network_mode: service:tailscale # Sidecar configuration to route ${SERVICE} through Tailscale
-    container_name: app-${SERVICE}-backend # Name for local container management
+    container_name: app-${SERVICE} # Name for local container management
     env_file:
       - .env
     environment:
@@ -86,19 +85,5 @@ services:
         condition: service_healthy
     restart: unless-stopped
 
-  # ${SERVICE} - Frontend (Web)
-  frontend:
-    image: ${IMAGE_URL_FRONTEND} # Image to be used
-    network_mode: service:tailscale # Sidecar configuration to route ${SERVICE} through Tailscale
-    container_name: app-${SERVICE}-frontend # Name for local container management
-    env_file:
-      - .env
-    depends_on:
-      tailscale:
-        condition: service_healthy
-      backend:
-        condition: service_started
-    restart: unless-stopped
-
 volumes:
   postgres_data: