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

templates/compose/labelstudio.yaml

@@ -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:-admin@example.com}
+      - 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/ollama-with-open-webui.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/rabbitmq.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/unstructured.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

templates/compose/weaviate.yaml

@@ -4,14 +4,12 @@
 # logo: svgs/weaviate.png
 # port: 8080
 
-version: "3"
 
 services:
   weaviate:
     image: "cr.weaviate.io/semitechnologies/weaviate:1.26.4"
-    restart: always
     volumes:
-      - "weaviate_data:/var/lib/weaviate"
+      - "weaviate-data:/var/lib/weaviate"
     command:
       - "--host"
       - 0.0.0.0
@@ -21,20 +19,20 @@ services:
       - http
     environment:
       - SERVICE_FQDN_WEAVIATE_8080
-      - DISABLE_TELEMETRY=true
-      - QUERY_DEFAULTS_LIMIT=1000
-      - LOG_LEVEL=info
+      - DISABLE_TELEMETRY=${DISABLE_TELEMETRY:-true}
+      - QUERY_DEFAULTS_LIMIT=${QUERY_DEFAULTS_LIMIT:-1000}
+      - LOG_LEVEL=${LOG_LEVEL:-info}
       - GOMEMLIMIT=${GOMEMLIMIT:-1024MiB}
       - GOMAXPROCS=${GOMAXPROCS:-2}
-      - AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=false
+      - AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=${AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED:-false}
       - AUTHORIZATION_ADMINLIST_USERS=${AUTHORIZATION_ADMINLIST_USERS:-admin@example.com}
       - AUTHENTICATION_APIKEY_USERS=${AUTHENTICATION_APIKEY_USERS:-admin@example.com}
-      - AUTHENTICATION_APIKEY_ENABLED=true
-      - "AUTHENTICATION_APIKEY_ALLOWED_KEYS=${SERVICE_PASSWORD_APIKEYS}"
+      - AUTHENTICATION_APIKEY_ENABLED=${AUTHENTICATION_APIKEY_ENABLED:-true}
+      - AUTHENTICATION_APIKEY_ALLOWED_KEYS=${SERVICE_PASSWORD_APIKEYS}
       - PERSISTENCE_DATA_PATH=/var/lib/weaviate
-      - DEFAULT_VECTORIZER_MODULE=none
+      - DEFAULT_VECTORIZER_MODULE=${DEFAULT_VECTORIZER_MODULE:-none}
       - ENABLE_MODULES=${ENABLE_MODULES:-text2vec-openai,generative-openai,qna-openai}
-      - CLUSTER_HOSTNAME=node1
+      - CLUSTER_HOSTNAME=${CLUSTER_HOSTNAME:-node1}
     healthcheck:
       test:
         - CMD
@@ -43,8 +41,5 @@ services:
         - "--spider"
         - "http://localhost:8080/v1/.well-known/ready"
       interval: 5s
-      timeout: 5s
-      retries: 3
-
-volumes:
-  weaviate_data: null
+      timeout: 30s
+      retries: 10