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

Author: peaklabs-dev

app/Models/Service.php

@@ -288,6 +288,31 @@ public function extraFields()
                 continue;
             }
             switch ($image) {
+                case $image->contains('label-studio'):
+                    $data = collect([]);
+                    $username = $this->environment_variables()->where('key', 'LABEL_STUDIO_USERNAME')->first();
+                    $password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_LABELSTUDIO')->first();
+                    if ($username) {
+                        $data = $data->merge([
+                            'Username' => [
+                                'key' => 'LABEL_STUDIO_USERNAME',
+                                'value' => data_get($username, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    if ($password) {
+                        $data = $data->merge([
+                            'Password' => [
+                                'key' => 'LABEL_STUDIO_PASSWORD',
+                                'value' => data_get($password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    $fields->put('Label Studio', $data->toArray());
+                    break;
                 case $image->contains('litellm'):
                     $data = collect([]);
                     $username = $this->environment_variables()->where('key', 'SERVICE_USER_UI')->first();

public/svgs/ollama.svg

@@ -7,40 +7,41 @@
 services:
   labelstudio:
     image: heartexlabs/label-studio:latest
-    restart: always
     depends_on:
       postgres:
         condition: service_healthy
     environment:
       - SERVICE_FQDN_LABELSTUDIO_8080
-      - DJANGO_DB=default
+      - DJANGO_DB=${DJANGO_DB:-default}
       - POSTGRE_NAME=${POSTGRES_DB:-labelstudio}
       - POSTGRE_USER=${SERVICE_USER_POSTGRES}
       - POSTGRE_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
       - POSTGRE_PORT=5432
       - POSTGRE_HOST=postgres
-      - LABEL_STUDIO_HOST=${LABEL_STUDIO_HOST:-0.0.0.0}
-      - SSRF_PROTECTION_ENABLED=true
+      - LABEL_STUDIO_HOST=${SERVICE_FQDN_LABELSTUDIO}
+      - SSRF_PROTECTION_ENABLED=${SSRF_PROTECTION_ENABLED:-true}
       - LABEL_STUDIO_DISABLE_SIGNUP_WITHOUT_LINK=${LABEL_STUDIO_DISABLE_SIGNUP_WITHOUT_LINK:-true}
       - DATA_UPLOAD_MAX_NUMBER_FILES=${DATA_UPLOAD_MAX_NUMBER_FILES:-10000}
+      - LABEL_STUDIO_USERNAME=${LABEL_STUDIO_USERNAME:[email protected]}
+      - LABEL_STUDIO_PASSWORD=${SERVICE_PASSWORD_LABELSTUDIO}
+      - LABEL_STUDIO_DISABLE_SIGNUP_WITHOUT_LINK=${LABEL_STUDIO_DISABLE_SIGNUP_WITHOUT_LINK:-true}
     volumes:
-      - labelstudio_data:/label-studio/data:rw
-
+      - labelstudio-data:/label-studio/data
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/health || exit 1"]
+      interval: 5s
+      timeout: 20s
+      retries: 3
   postgres:
     image: postgres:16-alpine
-    restart: always
     environment:
       - POSTGRES_USER=${SERVICE_USER_POSTGRES}
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
       - POSTGRES_DB=${POSTGRES_DB:-labelstudio}
     volumes:
-      - pg_data:/var/lib/postgresql/data
+      - pg-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -h localhost -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      test: ["CMD-SHELL", "pg_isready -h localhost -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
-      timeout: 5s
+      timeout: 20s
       retries: 3
-
-volumes:
-  pg_data:
-  labelstudio_data:

templates/compose/labelstudio.yaml

@@ -0,0 +1,45 @@
+# documentation: https://docs.openwebui.com
+# slogan: Ollama with Open Web UI integrates AI model deployment with a user-friendly interface.
+# 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
+
+  open-webui:
+    container_name: open-webui
+    image: "ghcr.io/open-webui/open-webui:main"
+    depends_on:
+      - ollama-api
+    environment:
+      - "OLLAMA_API_BASE_URL=http://127.0.0.1:11434"
+      - SERVICE_FQDN_OLLAMA_8080
+    restart: unless-stopped
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - "-f"
+        - "http://127.0.0.1:8080"
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+volumes:
+  ollama: {}

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

@@ -16,6 +16,6 @@ services:
       - ${PORT}:5672
     healthcheck:
       test: rabbitmq-diagnostics -q ping
-      interval: 30s
+      interval: 5s
       timeout: 30s
-      retries: 3
+      retries: 10

templates/compose/rabbitmq.yaml

@@ -4,8 +4,6 @@
 # logo: svgs/unstructured.png
 # port: 8000
 
-version: "3"
-
 services:
   unstructured:
     image: "downloads.unstructured.io/unstructured-io/unstructured-api:latest"
@@ -17,8 +15,7 @@ services:
         - CMD
         - wget
         - "-qO-"
-        - "--spider"
         - "http://0.0.0.0:8000/healthcheck"
-      interval: 15s
-      timeout: 15s
-      retries: 3
+      interval: 5s
+      timeout: 30s
+      retries: 10