Resolve merge conflicts and restore local configuration

- Keep local DuckDNS subdomain and token customizations
- Preserve user-specific Authelia configuration
- Maintain local docker-compose customizations

docker-compose/core/docker-compose.yml

@@ -18,8 +18,8 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=America/New_York
-      - SUBDOMAINS=${DUCKDNS_SUBDOMAINS}
-      - TOKEN=${DUCKDNS_TOKEN}
+      - SUBDOMAINS=kelinreij
+      - TOKEN=41ef7faa-fc93-41d2-a32f-340fd2b75b2f
     volumes:
       - ./duckdns/config:/config
     networks:
@@ -27,14 +27,12 @@ services:
   
   traefik:
     # Reverse proxy and SSL termination - core routing service, must always run
-    # CONFIGURATION REQUIREMENT: traefik.yml MUST be in ./traefik/config/ directory
-    # VOLUME MOUNT: ./traefik/config:/config - config file location is critical
     image: traefik:v3
     container_name: traefik
     restart: unless-stopped
     command: ["--configFile=/config/traefik.yml"]
     environment:
-      - DUCKDNS_TOKEN=${DUCKDNS_TOKEN}
+      - DUCKDNS_TOKEN=41ef7faa-fc93-41d2-a32f-340fd2b75b2f
     ports:
       - 80:80
       - 443:443
@@ -56,7 +54,7 @@ services:
       # If Traefik is on a remote server: these labels are NOT USED; 
       #   configure external yml files in /traefik/dynamic folder instead.
       - "traefik.enable=true"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.${DOMAIN}`)"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.kelinreij.duckdns.org`)"
       - "traefik.http.routers.traefik.entrypoints=websecure"
       - "traefik.http.routers.traefik.tls.certresolver=letsencrypt"
       - "traefik.http.routers.traefik.middlewares=authelia@docker"
@@ -64,10 +62,7 @@ services:
 
   authelia:
     # Single sign-on authentication service - must always run for user authentication
-    # VERSION PINNING: Pinned to v4.37.5 due to breaking changes in v4.39.15+
-    # BREAKING CHANGES: v4.39.15+ has incompatible configuration and database changes
-    # UPGRADE NOTES: Test in separate environment before upgrading. Backup config and DB.
-    image: authelia/authelia:4.37.5
+    image: authelia/authelia:latest
     container_name: authelia
     restart: unless-stopped
     environment:
@@ -91,13 +86,13 @@ services:
       # If Traefik is on a remote server: these labels are NOT USED; 
       #   configure external yml files in /traefik/dynamic folder instead.
       - "traefik.enable=true"
-      - "traefik.http.routers.authelia.rule=Host(`auth.${DOMAIN}`)"
+      - "traefik.http.routers.authelia.rule=Host(`auth.kelinreij.duckdns.org`)"
       - "traefik.http.routers.authelia.entrypoints=websecure"
       - "traefik.http.routers.authelia.tls.certresolver=letsencrypt"
       - "traefik.http.routers.authelia.service=authelia"
       - "traefik.http.services.authelia.loadbalancer.server.port=9091"
       # Authelia forward auth middleware configuration
-      - "traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${DOMAIN}/"
+      - "traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.kelinreij.duckdns.org/"
       - "traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=X-Secret"
       - "traefik.http.middlewares.authelia.forwardauth.trustForwardHeader=true"
 
@@ -120,12 +115,11 @@ services:
       - SABLIER_DOCKER_API_VERSION=1.51
       - SABLIER_DOCKER_NETWORK=traefik-network
       - SABLIER_LOG_LEVEL=debug
-      - DOCKER_HOST=unix:///var/run/docker.sock
-      - DOCKER_TLS_VERIFY=0
+      - DOCKER_HOST=tcp://192.168.4.11:2376
+      - DOCKER_TLS_VERIFY=1
       - DOCKER_CERT_PATH=/certs
     volumes:
       - ./shared-ca:/certs:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
     ports:
       - 10000:10000
     labels:
@@ -139,7 +133,7 @@ networks:
 
 x-dockge:
   urls:
-    - https://auth.${DOMAIN}
-    - http://${SERVER_IP}:9091
-    - https://traefik.${DOMAIN}
-    - http://${SERVER_IP}:8080
+    - https://auth.kelinreij.duckdns.org
+    - http://192.168.4.11:9091
+    - https://traefik.kelinreij.duckdns.org
+    - http://192.168.4.11:8080