From 596ffd8a6b27982e3b6b37e974f6502a048457e6 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 7 May 2026 21:17:11 +0200
Subject: [PATCH] Improve ollama

---
 infrastructure/services/caddy/docker-compose.caddy.yml   | 3 ++-
 infrastructure/services/main/docker-compose.main.yml     | 9 +++++++++
 .../services/open-webui/docker-compose.open-webui.yml    | 7 +++++++
 infrastructure/services/open-webui/env/ollama.env        | 7 +++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 infrastructure/services/open-webui/env/ollama.env

diff --git a/infrastructure/services/caddy/docker-compose.caddy.yml b/infrastructure/services/caddy/docker-compose.caddy.yml
index bfbebb7..5b8ff38 100644
--- a/infrastructure/services/caddy/docker-compose.caddy.yml
+++ b/infrastructure/services/caddy/docker-compose.caddy.yml
@@ -1,7 +1,8 @@
 services:
   # Caddy
   caddy:
-    image: bensuperpc/caddy-l4:latest
+    #image: bensuperpc/caddy-l4:latest
+    image: caddy:latest
     container_name: caddy
     profiles:
       - caddy
diff --git a/infrastructure/services/main/docker-compose.main.yml b/infrastructure/services/main/docker-compose.main.yml
index 6079f27..32c09a9 100644
--- a/infrastructure/services/main/docker-compose.main.yml
+++ b/infrastructure/services/main/docker-compose.main.yml
@@ -18,6 +18,15 @@ services:
     # Fix root permissions on mounted volumes
     command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
 
+  watchtower:
+    container_name: watchtower
+    profiles:
+      - main_infrastructure
+    image: nickfedor/watchtower:latest
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: unless-stopped
+
 volumes:
   public_data:
     name: public_data
diff --git a/infrastructure/services/open-webui/docker-compose.open-webui.yml b/infrastructure/services/open-webui/docker-compose.open-webui.yml
index 9b9801b..a80189d 100644
--- a/infrastructure/services/open-webui/docker-compose.open-webui.yml
+++ b/infrastructure/services/open-webui/docker-compose.open-webui.yml
@@ -5,16 +5,23 @@ services:
     container_name: ollama
     profiles:
       - open-webui
+      - ollama
     depends_on:
       - caddy
     restart: on-failure:5
     tty: true
     volumes:
       - ollama:/root/.ollama
+    env_file:
+      - ./env/ollama.env
     security_opt:
       - no-new-privileges:true
     networks:
       - infra-network
+    # devices:
+     #  - /dev/dri/card0:/dev/dri/card0
+     #  - /dev/dri/renderD128:/dev/dri/renderD128
+
 
   open-webui:
     image: ghcr.io/open-webui/open-webui:main
diff --git a/infrastructure/services/open-webui/env/ollama.env b/infrastructure/services/open-webui/env/ollama.env
new file mode 100644
index 0000000..24df31c
--- /dev/null
+++ b/infrastructure/services/open-webui/env/ollama.env
@@ -0,0 +1,7 @@
+# OLLAMA_GPU_OVERHEAD=0
+# OLLAMA_VULKAN=1
+# OLLAMA_NEW_ENGINE=1
+# OLLAMA_GPU_LAYERS=
+# OLLAMA_DEBUG=1
+# OLLAMA_SCHED_SPREAD=1
+# OLLAMA_FLASH_ATTENTION=1