fix: update openconcho SHA (template literal for ReactNode)

- rebased custom commits on upstream v0.16.0
- 125 upstream commits since fork base (e490d91)
- includes dashboard, fleet, dark mode, deps consolidation
- our TS fixes preserved on top

ai/compose.yml

@@ -1,30 +1,5 @@
-version: "3.8"
 services:
 
-  # webui:
-  #   image: ghcr.io/open-webui/open-webui:main
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
-  #   restart: always
-  #   environment:
-  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
-  #   networks:
-  #     - ai_net
-  #     - ai_backend
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-http.entrypoints=web"
-  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
-
-  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
-  #     - "traefik.http.routers.webui-https.tls=true"
-  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
-
   hermes:
     build:
       context: ./hermes
@@ -32,13 +7,15 @@ services:
         - default
     container_name: hermes
     entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
       "hermes-entrypoint"]
     restart: always
     # Gateway run enables the internal API server on port 8642
     command: gateway run
     environment:
-      - OLLAMA_HOST=http://ollama:11434
+      - HERMES_UID=10000
+      - HERMES_GID=10000
+      - OLLAMA_HOST=http://ollama-cpu:11434
       - HERMES_DASHBOARD=1
       # Multi-profile: comma-separated list of profiles to run as gateways.
       # The entrypoint reads this and starts one gateway per profile.
@@ -50,6 +27,7 @@ services:
       - API_SERVER_KEY=hermes_local_key
       - GATEWAY_ALLOW_ALL_USERS=true
       - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+      - OPENCODE_API_KEY=${OPENCODE_API_KEY}
       # ROCm for GPU-accelerated faster-whisper STT
       - HSA_OVERRIDE_GFX_VERSION=9.0.6
       - HCC_AMDGPU_TARGET=gfx906
@@ -59,10 +37,7 @@ services:
       - TZ=America/Montreal
     volumes:
       - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
-      # Syncthing-shared org files — read-only view of user's agenda
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
-      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/opt/data/ExoKortex
     devices:
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
@@ -109,31 +84,36 @@ services:
       - "21027:21027/udp"
     environment:
       - TZ=America/Montreal
+      - PUID=10000
+      - PGID=10000
     volumes:
-      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/config:/var/syncthing/config
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/ExoKortex
     networks:
       - ai_backend
       - ai_net
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=ai_net"
+
       - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-http.entrypoints=web"
       - "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
+
       - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-https.entrypoints=websecure"
       - "traefik.http.routers.syncthing-https.tls=true"
       - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
+      - "traefik.http.routers.syncthing-https.middlewares=hermes-auth"
+
       - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
 
-
-  ollama:
+  ollama-cpu:
     build:
       context: ./ollama
       dockerfile: Dockerfile
     image: ollama/ollama:rocm-gfx906
-    container_name: ollama
+    container_name: ollama-cpu
     tty: true
     restart: always 
     ports:
@@ -144,22 +124,42 @@ services:
       - /mnt/HoardingCow_docker_data/Ollama/ollama:/root/.ollama
     environment:
       - OLLAMA_VULKAN=0
-      - HSA_OVERRIDE_GFX_VERSION=9.0.6
-      - HCC_AMDGPU_TARGET=gfx906
-      - HIP_VISIBLE_DEVICES=0,1
-      - ROCR_VISIBLE_DEVICES=0,1
-      - HSA_ENABLE_SDMA=0 
       - OLLAMA_HOST=0.0.0.0
-      - OLLAMA_DEBUG=1
-      - OLLAMA_FLASH_ATTENTION=1
-      - OLLAMA_NUM_PARALLEL=2
+
+  llama-cpp-hermes:
+    image: llama-cpp:rocm-gfx906
+    container_name: llama-cpp-hermes
+    restart: unless-stopped
+    networks:
+      - ai_backend
+    ports:
+      - "127.0.0.1:8300:8080"
+    ipc: host
     devices:
-      # Map the render nodes and KFD for ROCm to work inside the container
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
     group_add:
       - "303"
       - "26"
+    environment:
+      - HSA_OVERRIDE_GFX_VERSION=9.0.6
+      - HSA_ENABLE_SDMA=0
+      - HIP_VISIBLE_DEVICES=0,1
+      - LLAMA_CACHE=/models
+    volumes:
+      - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
+      - /mnt/HoardingCow_docker_data/Ollama/ollama/models/blobs/sha256-17823599694fa3503ef54bf748d5078c6ce881f4d01616cafa255dc05d215a08:/model.gguf:ro
+    command: >
+      -m /model.gguf
+      --host 0.0.0.0
+      --port 8080
+      --gpu-layers 99
+      --ctx-size 163840
+      -ctk f16 -ctv f16
+      --flash-attn on
+      --split-mode layer
+      --no-mmap
+      --n-predict -1
 
   # --- Honcho + OpenConcho combiné: API + Web UI nginx/FastAPI ---
   honcho:
@@ -173,13 +173,13 @@ services:
       - DB_CONNECTION_URI=postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho
       - CACHE_URL=redis://honcho-redis:6379/0
       - CACHE_ENABLED=true
-      - EMBEDDING_VECTOR_DIMENSIONS=1536
+      - EMBEDDING_VECTOR_DIMENSIONS=1024
       - AUTH_USE_AUTH=true
       - AUTH_JWT_SECRET=${HONCHO_AUTH_JWT_SECRET}
       # Needed by deriver/dream to make LLM calls (api_key_env = "HONCHO_OPENAI_API_KEY" in config.toml)
       - HONCHO_OPENAI_API_KEY=${HONCHO_OPENAI_API_KEY}
     volumes:
-      - honcho_data:/app/data
+      - /mnt/HoardingCow_docker_data/Honcho/data:/app/data
       - /mnt/HoardingCow_docker_data/Honcho/config.toml:/app/config.toml:ro
     networks:
       - ai_backend
@@ -203,10 +203,8 @@ services:
       # Service Loadbalancer (nginx port)
       - "traefik.http.services.honcho.loadbalancer.server.port=80"
     depends_on:
-      honcho-db:
-        condition: service_healthy
-      honcho-redis:
-        condition: service_healthy
+      - honcho-db
+      - honcho-redis
 
   honcho-db:
     image: pgvector/pgvector:pg15
@@ -225,11 +223,6 @@ services:
       - ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
   honcho-redis:
     image: redis:8
@@ -241,15 +234,10 @@ services:
       - /mnt/HoardingCow_docker_data/Honcho/redis:/data
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
 networks:
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   ai_backend:
     driver: bridge
@@ -257,51 +245,9 @@ networks:
 
 volumes:
   honcho_data:
-    external: true
+    driver: bridge
     name: honcho_data
     
-  # llama_cpp_devstral:
-  #   image: ghcr.io/ggml-org/llama.cpp:server-rocm
-  #   container_name: llama_cpp_devstral
-  #   restart: unless-stopped
-  #   networks:
-  #     - ai_backend
-  #   ports:
-  #     - "8300:8080"
-  #   ipc: host
-  #   devices:
-  #     - "/dev/kfd:/dev/kfd"
-  #     - "/dev/dri:/dev/dri"
-  #   group_add:
-  #     - "303" # video
-  #     - "26"  # render
-  #   environment:
-  #     HSA_OVERRIDE_GFX_VERSION: 9.0.6
-  #     HIP_VISIBLE_DEVICES: 0,1
-  #     LLAMA_CACHE: /models
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/models:/models
-  #     - /mnt/HoardingCow_docker_data/Llama_cpp/devstral-agent.jinja:/template.jinja
-  #   command: >
-  #     -hf unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF:Devstral-Small-2-24B-Instruct-2512-Q8_0.gguf
-  #     -a devstral-2-small-llama_cpp
-  #     --chat-template-file /template.jinja
-  #     --host 0.0.0.0
-  #     --port 8080
-  #     --n-gpu-layers 99
-  #     --ctx-size 163840
-  #     --batch-size 4096
-  #     --ubatch-size 4096
-  #     --cache-type-k f16
-  #     --cache-type-v f16
-  #     --cache-reuse 256
-  #     --flash-attn on
-  #     --context-shift
-  #     --split-mode layer
-  #     --no-mmap
-  #     --n-predict -1
-  #     --parallel 2
-
   # vllm:
   #   image: nalanzeyu/vllm-gfx906:v0.9.0-rocm6.3
   #   container_name: vllm
@@ -348,6 +294,30 @@ volumes:
   #     - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
   #   restart: unless-stopped
 
+  # webui:
+  #   image: ghcr.io/open-webui/open-webui:main
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
+  #   restart: always
+  #   environment:
+  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
+  #   networks:
+  #     - ai_net
+  #     - ai_backend
+  #   labels:
+  #     - "traefik.enable=true"
+
+  #     # Router for HTTP + redirection to HTTPS
+  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-http.entrypoints=web"
+  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
+
+  #     # Router for HTTPS with TLS
+  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
+  #     - "traefik.http.routers.webui-https.tls=true"
+  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
+
   # n8n:
   #   image: n8nio/n8n:latest
   #   container_name: n8n

ai/hermes/Dockerfile

@@ -9,30 +9,11 @@
 # ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
 FROM nousresearch/hermes-agent:latest
 
-# ---------- Overlay our forked source ----------
-# Uses SSH agent forwarding from the build host (no key baked into image).
-# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
-# Only the Python source, web UI source, and config change.
-RUN --mount=type=ssh \
-    mkdir -p /root/.ssh && \
-    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
-    cd /tmp && \
-    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
-    git clone --depth 1 --branch main \
-    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
-    rm -rf fork/node_modules fork/.venv fork/.git && \
-    cp -a fork/. /opt/hermes/ && \
-    rm -rf /tmp/fork /root/.ssh/
-
-# ---------- Reinstall Python package (editable) ----------
-# Picks up source changes from our fork.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir --no-deps -e /opt/hermes
-
 # ---------- Extra system deps ----------
 USER root
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
+        gosu \
         libportaudio2 ca-certificates poppler-utils imagemagick \
         libolm-dev \
         texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
@@ -43,12 +24,6 @@ RUN apt-get update && \
 # ---------- UV ----------
 COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
 
-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
 WORKDIR /opt/hermes
 
 # ---------- Matrix bridge + extra pip deps ----------
@@ -101,3 +76,8 @@ USER root
 RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
 
 VOLUME [ "/opt/data" ]
+
+# Switch to the hermes user so the container runs unprivileged.
+# All child processes inherit this user — no more orphan root processes
+# that escape gosu privilege drops in the entrypoint.
+USER hermes

ai/honcho/Dockerfile

@@ -2,13 +2,14 @@
 FROM python:3.13-slim-bookworm AS honcho-builder
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends git && \
+    apt-get install -y --no-install-recommends git openssh-client && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
 
 ARG HONCHO_REPO=ssh://git@code.lazyworkhorse.net:2222/Hermes/honcho.git
 ARG HONCHO_REF=main
+RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
 RUN --mount=type=ssh git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
 
 WORKDIR /app
@@ -27,10 +28,11 @@ ENV PATH=$PNPM_HOME:$PATH
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
 WORKDIR /app
-RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git openssh-client && rm -rf /var/lib/apt/lists/**
 
-ARG OPENCONCHO_SHA=e490d911fcb27ee193558fd9a28856cde2057665
-RUN git clone --depth 1 https://github.com/offendingcommit/openconcho.git /app && \
+ARG OPENCONCHO_SHA=148766312e6a5256f399c64171854f0ff6173b6d
+RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
+RUN --mount=type=ssh git clone --depth 1 ssh://git@code.lazyworkhorse.net:2222/gortium/openconcho.git /app && \
     git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
     git -C /app checkout ${OPENCONCHO_SHA}
 
@@ -71,4 +73,4 @@ COPY honcho-nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
 
-CMD ["sh", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py & python3 -m src.deriver & wait -n"]
+CMD ["bash", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py & python3 -m src.deriver & wait -n"]

ai/llama-cpp/Dockerfile

@@ -0,0 +1,32 @@
+# llama-cpp-rocm6/Dockerfile
+# Custom llama.cpp server with ROCm 6.1 + gfx906 (MI50) support.
+# Build: docker build -t llama-cpp:rocm-gfx906 .
+# NOTE: Update LLAMACPP_VERSION for bugfixes, but verify ROCm 6.1 compat
+#       by checking if recent releases still support -DGGML_HIP=ON.
+
+FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl git build-essential pkg-config cmake make && rm -rf /var/lib/apt/lists/*
+ARG LLAMACPP_VERSION=b9890
+RUN git clone --depth 1 --branch ${LLAMACPP_VERSION} https://github.com/ggml-org/llama.cpp.git /build
+WORKDIR /build
+ENV HIP_PATH=/opt/rocm ROCM_PATH=/opt/rocm PATH=/opt/rocm/bin:/opt/rocm/llvm/bin:${PATH} CMAKE_PREFIX_PATH=/opt/rocm
+RUN mkdir build && cd build && \
+    cmake .. -DGGML_HIP=ON -DCMAKE_BUILD_TYPE=Release \
+      -DAMDGPU_TARGETS="gfx906:xnack-" \
+      -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+      -DGGML_CUDA=OFF -DGGML_VULKAN=OFF -DGGML_METAL=OFF \
+      -DBUILD_SHARED_LIBS=OFF && \
+    cmake --build . --target llama-server -- -j $(nproc)
+
+FROM ubuntu:24.04
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    ca-certificates curl libstdc++6 libgomp1 libopenblas0 \
+    libnuma1 libelf1 libdrm2 libdrm-amdgpu1 \
+    && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
+COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
+COPY --from=builder /build/build/bin/llama-server /usr/local/bin/llama-server
+RUN echo /opt/rocm/lib > /etc/ld.so.conf.d/rocm.conf && ldconfig
+ENV HSA_OVERRIDE_GFX_VERSION=9.0.6 HCC_AMDGPU_TARGET=gfx906 HSA_ENABLE_SDMA=0
+EXPOSE 8080
+ENTRYPOINT ["/usr/local/bin/llama-server"]

authentification/compose.yml

@@ -32,5 +32,5 @@ services:
 
 networks:
   auth_net:
-    external: true
+    driver: bridge
     name: auth_net

backup/compose.yml

@@ -68,33 +68,33 @@ services:
     labels:
       - "traefik.enable=false" # Internal only, accessed by restic-browser
 
-  restic-browser:
-    image: embergarage/restic-browser:latest
-    container_name: restic-browser
-    restart: always 
-    environment:
-      - TZ=America/Montreal
-      - RESTIC_REPOSITORY=http://restic-server:8080
-      - RESTIC_PASSWORD=${RESTIC_PASSWORD}
-    networks:
-      - backup_net
-    labels:
-      - "traefik.enable=true"
-      # 1. HTTP to HTTPS Redirect
-      - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.restic-browser-http.entrypoints=web"
-      - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
-      
-      # 2. HTTPS Configuration
-      - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.restic-browser.entrypoints=websecure"
-      - "traefik.http.routers.restic-browser.tls=true"
-      - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
-      
-      # 3. Backend Service Config
-      - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
+# restic-browser:
+#   image: mazzolino/restic-browser:latest
+#   container_name: restic-browser
+#   restart: always 
+#   environment:
+#     - TZ=America/Montreal
+#     - RESTIC_REPOSITORY=http://restic-server:8080
+#     - RESTIC_PASSWORD=${RESTIC_PASSWORD}
+#   networks:
+#     - backup_net
+#   labels:
+#     - "traefik.enable=true"
+#     # 1. HTTP to HTTPS Redirect
+#     - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
+#     - "traefik.http.routers.restic-browser-http.entrypoints=web"
+#     - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
+#     
+#     # 2. HTTPS Configuration
+#     - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
+#     - "traefik.http.routers.restic-browser.entrypoints=websecure"
+#     - "traefik.http.routers.restic-browser.tls=true"
+#     - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
+#     
+#     # 3. Backend Service Config
+#     - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
 
 networks:
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net

cloudstorage/compose.yml

@@ -6,6 +6,7 @@ services:
     restart: always
     networks:
       - cloud_net
+      - cloud_internal
     environment:
       - PUID=1000
       - PGID=1000
@@ -51,7 +52,7 @@ services:
     container_name: nextcloud_cron
     restart: always 
     networks:
-      - cloud_net
+      - cloud_internal
     entrypoint: /cron.sh
     volumes:
       - /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
@@ -75,7 +76,7 @@ services:
 
 networks:
   cloud_net:
-    external: true
+    driver: bridge
     name: cloud_net
   cloud_internal:
     driver: bridge

coms/compose.yml

@@ -103,7 +103,7 @@ services:
 
 networks:
   coms_net:
-    external: true
+    driver: bridge
     name: coms_net
   coms_backend:
     driver: bridge

copy_script.txt

@@ -1,7 +0,0 @@
-import shutil, os
-src = "/opt/data/projects/gortium/compose/ai/compose_updated.txt"
-dst = "/opt/data/projects/gortium/compose/ai/compose.yml"
-print(f"Source exists: {os.path.exists(src)}, size: {os.path.getsize(src)}")
-print(f"Dest exists: {os.path.exists(dst)}")
-shutil.copy2(src, dst)
-print(f"Copied, dest size: {os.path.getsize(dst)}")

entrypoint-combined.sh

@@ -1,154 +0,0 @@
-#!/bin/bash
-# ── Hermes Workspace Combined Entrypoint ──
-# Waits for the Hermes gateway container (hermes:8642) to become healthy,
-# then starts the Hermes Workspace web UI in the foreground.
-# Supports graceful shutdown via SIGTERM/SIGINT.
-# ──────────────────────────────────────────
-
-set -euo pipefail
-
-# ── Configuration ──────────────────────────────────────────────
-GATEWAY_HOST="${GATEWAY_HOST:-hermes}"
-GATEWAY_PORT="${GATEWAY_PORT:-8642}"
-GATEWAY_URL="http://${GATEWAY_HOST}:${GATEWAY_PORT}"
-
-HEALTH_ENDPOINT="${HEALTH_ENDPOINT:-/health}"
-MAX_RETRIES="${HEALTH_MAX_RETRIES:-60}"
-RETRY_INTERVAL="${HEALTH_RETRY_INTERVAL:-2}"
-
-WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
-WORKSPACE_ENTRY="${WORKSPACE_ENTRY:-server-entry.js}"
-
-PID_FILE="${PID_FILE:-/tmp/workspace.pid}"
-
-# ── Logging ────────────────────────────────────────────────────
-log_info()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [INFO]  $*"; }
-log_warn()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [WARN]  $*"; }
-log_error() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR] $*"; }
-
-# ── Graceful Shutdown ──────────────────────────────────────────
-_workspace_pid=""
-_shutting_down=false
-
-cleanup() {
-    if [ "$_shutting_down" = true ]; then
-        return
-    fi
-    _shutting_down=true
-
-    log_info "Shutdown signal received, cleaning up..."
-
-    # Stop workspace process if running
-    if [ -n "$_workspace_pid" ] && kill -0 "$_workspace_pid" 2>/dev/null; then
-        log_info "Stopping workspace (PID: $_workspace_pid)..."
-        kill -TERM "$_workspace_pid" 2>/dev/null || true
-
-        # Give it time to shut down gracefully
-        local wait_sec=10
-        while kill -0 "$_workspace_pid" 2>/dev/null && [ "$wait_sec" -gt 0 ]; do
-            sleep 1
-            wait_sec=$((wait_sec - 1))
-        done
-
-        # Force kill if still running
-        if kill -0 "$_workspace_pid" 2>/dev/null; then
-            log_warn "Workspace did not shut down gracefully, force killing..."
-            kill -KILL "$_workspace_pid" 2>/dev/null || true
-        fi
-    fi
-
-    # Clean up PID file
-    [ -f "$PID_FILE" ] && rm -f "$PID_FILE"
-
-    log_info "Shutdown complete."
-    exit 0
-}
-
-# Trap termination signals for graceful shutdown
-trap cleanup SIGTERM SIGINT
-
-# ── Gateway Health Check ───────────────────────────────────────
-wait_for_gateway() {
-    local url="${GATEWAY_URL}${HEALTH_ENDPOINT}"
-    local retries="$MAX_RETRIES"
-    local interval="$RETRY_INTERVAL"
-    local attempt=0
-
-    log_info "Waiting for Hermes gateway at ${GATEWAY_URL}..."
-    log_info "Max retries: ${retries}, interval: ${interval}s"
-
-    while [ "$attempt" -lt "$retries" ]; do
-        attempt=$((attempt + 1))
-
-        if curl -fsS "${url}" >/dev/null 2>&1; then
-            log_info "Gateway is healthy after ${attempt} attempt(s) (${GATEWAY_URL})"
-            return 0
-        fi
-
-        if [ "$attempt" -lt "$retries" ]; then
-            log_info "Gateway not ready yet (attempt ${attempt}/${retries}), retrying in ${interval}s..."
-            sleep "$interval"
-        fi
-    done
-
-    log_error "Gateway did not become healthy after ${retries} attempts (${retries * interval}s)"
-    return 1
-}
-
-# ── Workspace Startup ──────────────────────────────────────────
-start_workspace() {
-    local entry="${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-
-    if [ ! -d "$WORKSPACE_DIR" ]; then
-        log_error "Workspace directory not found: ${WORKSPACE_DIR}"
-        return 1
-    fi
-
-    if [ ! -f "$entry" ]; then
-        log_error "Workspace entry point not found: ${entry}"
-        return 1
-    fi
-
-    log_info "Starting Hermes Workspace web UI..."
-    log_info "  Directory: ${WORKSPACE_DIR}"
-    log_info "  Entry:     ${entry}"
-
-    cd "$WORKSPACE_DIR"
-
-    # Start workspace in background so we can trap signals
-    exec node --max-old-space-size=2048 "${entry}" &
-    _workspace_pid=$!
-    echo "$_workspace_pid" > "$PID_FILE"
-
-    log_info "Workspace started (PID: ${_workspace_pid})"
-
-    # Wait for workspace process
-    wait "$_workspace_pid"
-    local exit_code=$?
-
-    log_info "Workspace exited with code ${exit_code}"
-    return "$exit_code"
-}
-
-# ── Main ───────────────────────────────────────────────────────
-main() {
-    log_info "=== Hermes Workspace Combined Entrypoint ==="
-    log_info "Gateway:   ${GATEWAY_URL}"
-    log_info "Workspace: ${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-    log_info "PID file:  ${PID_FILE}"
-
-    # Wait for gateway to be healthy
-    if ! wait_for_gateway; then
-        log_warn "Proceeding without confirmed gateway health..."
-    fi
-
-    # Start the workspace
-    start_workspace
-    local exit_code=$?
-
-    log_info "Entrypoint exiting with code ${exit_code}"
-    return "$exit_code"
-}
-
-# Run main; exit with its return code
-main "$@"

finance/compose.yml

@@ -37,4 +37,5 @@ services:
 
 networks:
   finance_net:
-    external: true
+    driver: bridge
+    name: finance_net

homeautomation/compose.yml

@@ -12,8 +12,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Home_Assistant:/config:rw
     networks:
-      - home_auto_net
-      - home_auto_backend
+      - home_net
+      - home_backend
     labels:
       - "traefik.enable=true"
 
@@ -34,7 +34,7 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Mosquitto:/mosquitto
     networks:
-      - home_auto_backend
+      - home_backend
     # ports:
     #   - 1883:1883
     #   - 9001:9001
@@ -43,7 +43,7 @@ services:
     image: registry.gitlab.com/hydroqc/hydroqc2mqtt:1.3.0
     restart: always
     networks:
-      - home_auto_backend
+      - home_backend
     environment:
       MQTT_USERNAME: hass
       MQTT_PASSWORD: ${MQTT_PASSWORD}
@@ -88,8 +88,9 @@ services:
   #   restart: unless-stopped
 
 networks:
-  home_auto_net:
-    external: true
-  home_auto_backend:
+  home_net:
     driver: bridge
-    name: home_auto_backend
+    name: home_net
+  home_backend:
+    driver: bridge
+    name: home_backend

homepage/compose.yml

@@ -38,4 +38,5 @@ services:
 
 networks:
   homepage_net:
-    external: true
+    driver: bridge
+    name: homepage_net

network/compose.yml

@@ -36,9 +36,9 @@ services:
       - cloud_net
       - coms_net
       - finance_net
-      - home_auto_net
+      - home_net
       - homepage_net
-      - passman_net
+      - pass_net
       - tak_net
       - vc_net
 
@@ -82,37 +82,37 @@ networks:
     driver: bridge
     name: traefik_backend
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   auth_net:
-    external: true
+    driver: bridge
     name: auth_net
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net
   cloud_net:
-    external: true
+    driver: bridge
     name: cloud_net
   coms_net:
-    external: true
+    driver: bridge
     name: coms_net
   finance_net:
-    external: true
+    driver: bridge
     name: finance_net
-  home_auto_net:
-    external: true
-    name: home_auto_net
+  home_net:
+    driver: bridge
+    name: home_net
   homepage_net:
-    external: true
+    driver: bridge
     name: homepage_net
-  passman_net:
-    external: true
-    name: passman_net
+  pass_net:
+    driver: bridge
+    name: pass_net
   tak_net:
-    external: true
+    driver: bridge
     name: tak_net
   vc_net:
-    external: true
+    driver: bridge
     name: vc_net
 
   # duckdns:

passwordmanager/compose.yml

@@ -13,7 +13,7 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
     networks:
-      - passman_net
+      - pass_net
     restart: always
     labels:
       - "traefik.enable=true"
@@ -32,5 +32,6 @@ services:
       # Internal service
       - "traefik.http.services.pass.loadbalancer.server.port=80"
 networks:
-  passman_net:
-    external: true
+  pass_net:
+    driver: bridge
+    name: pass_net

replace_compose.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-"""Copy the updated txt file over the original yml file."""
-import shutil
-import os
-
-src = "/opt/data/projects/gortium/compose/ai/compose_updated.txt"
-dst = "/opt/data/projects/gortium/compose/ai/compose.yml"
-
-# Check src exists
-print(f"Source exists: {os.path.exists(src)}")
-print(f"Source size: {os.path.getsize(src)} bytes")
-print(f"Destination exists: {os.path.exists(dst)}")
-
-# Copy
-shutil.copy2(src, dst)
-print(f"Copied {src} -> {dst}")
-print(f"Destination size: {os.path.getsize(dst)} bytes")

tak/compose.yml

@@ -92,7 +92,8 @@ services:
 
 networks:
   tak_net:
-    external: true
+    driver: bridge
+    name: tak_net
   tak_backend:
     driver: bridge
     name: tak_backend

versioncontrol/compose.yml

@@ -61,4 +61,5 @@ services:
 
 networks:
   vc_net:
-    external: true
+    driver: bridge
+    name: vc_net

vpn/compose.yml

@@ -12,7 +12,7 @@ services:
       - SYS_MODULE
     environment:
       - WG_HOST=vpn.lazyworkhorse.net
-      - PASSWORD=${WG_PASSWORD}
+      - PASSWORD_HASH=${WG_PASSWORD_HASH}
       - WG_PORT=51820
       - WG_DEFAULT_ADDRESS=10.8.0.x
       - WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
@@ -22,7 +22,6 @@ services:
       - UI_CHART_TYPE=0
     ports:
       - "51820:51820/udp"
-      - "51821:51821/tcp"
     volumes:
       - /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
     sysctls:
@@ -31,8 +30,31 @@ services:
     restart: unless-stopped
     networks:
       - vpn_net
+    labels:
+      - "traefik.enable=true"
+
+      # HTTP → HTTPS redirect
+      - "traefik.http.routers.wireguard-http.rule=Host(vpn.lazyworkhorse.net)"
+      - "traefik.http.routers.wireguard-http.entrypoints=web"
+      - "traefik.http.routers.wireguard-http.middlewares=redirect-to-https"
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+      # HTTPS router — protégé par Authelia
+      - "traefik.http.routers.wireguard-https.rule=Host(vpn.lazyworkhorse.net)"
+      - "traefik.http.routers.wireguard-https.entrypoints=websecure"
+      - "traefik.http.routers.wireguard-https.tls=true"
+      - "traefik.http.routers.wireguard-https.tls.certresolver=njalla"
+      - "traefik.http.routers.wireguard-https.middlewares=wireguard-auth"
+
+      # Authelia forwardAuth
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.trustforwardheader=true"
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
+
+      # Port interne du web UI wg-easy
+      - "traefik.http.services.wireguard.loadbalancer.server.port=51821"
 
 networks:
   vpn_net:
-    external: true
+    driver: bridge
     name: vpn_net