Merge branch 'next' of https://github.com/coollabsio/coolify into next

Author: peaklabs-dev

app/Livewire/Project/New/Select.php

@@ -256,7 +256,7 @@ public function instantSave()
 
     public function setType(string $type)
     {
-        $type = str($type)->lower()->value();
+        $type = str($type)->lower()->slug()->value();
         if ($this->loading) {
             return;
         }

templates/compose/ollama-with-open-webui.yaml

@@ -3,43 +3,32 @@
 # tags: ollama,ai,models,deployment,open-web-ui,integration
 # logo: svgs/ollama.svg
 
-version: "3.9"
-
 services:
   ollama-api:
-    container_name: ollama
     image: "ollama/ollama:latest"
     volumes:
       - "ollama:/root/.ollama"
-    ports:
-      - 11434:11434
-    tty: true
-    restart: unless-stopped
-    pull_policy: always
     healthcheck:
       test: ["CMD", "ollama", "list"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      interval: 5s
+      timeout: 30s
+      retries: 10
 
   open-webui:
-    container_name: open-webui
     image: "ghcr.io/open-webui/open-webui:main"
+    volumes:
+      - "open-webui:/app/backend/data"
     depends_on:
       - ollama-api
     environment:
-      - "OLLAMA_API_BASE_URL=http://127.0.0.1:11434"
       - SERVICE_FQDN_OLLAMA_8080
-    restart: unless-stopped
+      - OLLAMA_BASE_URL=http://ollama-api:11434
     healthcheck:
       test:
         - CMD
         - curl
         - "-f"
         - "http://127.0.0.1:8080"
-      interval: 30s
-      timeout: 10s
-      retries: 3
-
-volumes:
-  ollama: {}
+      interval: 5s
+      timeout: 30s
+      retries: 10