From 515f697db61ce5b7d98b763e93505774d3d88cd2 Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Tue, 21 May 2024 20:01:38 +0200
Subject: [PATCH] fix(glances, open-webui): wrong compose.json format

---
 apps/glance/config.json             |  2 +-
 apps/glance/docker-compose.json     | 19 +++++++++++--------
 apps/open-webui/config.json         |  2 +-
 apps/open-webui/docker-compose.json | 29 ++++++++++++++++-------------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/apps/glance/config.json b/apps/glance/config.json
index e2fbcef6..f5793277 100644
--- a/apps/glance/config.json
+++ b/apps/glance/config.json
@@ -5,7 +5,7 @@
   "available": true,
   "exposable": true,
   "id": "glance",
-  "tipi_version": 1,
+  "tipi_version": 2,
   "version": "v0.4.0",
   "categories": ["utilities"],
   "description": "A self-hosted dashboard that puts all your feeds in one place",
diff --git a/apps/glance/docker-compose.json b/apps/glance/docker-compose.json
index 05e02f08..a25ba96c 100644
--- a/apps/glance/docker-compose.json
+++ b/apps/glance/docker-compose.json
@@ -1,13 +1,16 @@
 {
-  "openPort": true,
-  "image": "glanceapp/glance:v0.4.0",
-  "name": "glance",
-  "internalPort": "8080",
-  "isMain": true,
-  "volumes": [
+  "services": [
     {
-      "hostPath": "${APP_DATA_DIR}/data/glance.yml",
-      "containerPath": "/app/glance.yml"
+      "image": "glanceapp/glance:v0.4.0",
+      "name": "glance",
+      "internalPort": 8080,
+      "isMain": true,
+      "volumes": [
+        {
+          "hostPath": "${APP_DATA_DIR}/data/glance.yml",
+          "containerPath": "/app/glance.yml"
+        }
+      ]
     }
   ]
 }
diff --git a/apps/open-webui/config.json b/apps/open-webui/config.json
index 9a69ca6c..d0d6b918 100644
--- a/apps/open-webui/config.json
+++ b/apps/open-webui/config.json
@@ -5,7 +5,7 @@
   "exposable": true,
   "port": 8536,
   "id": "open-webui",
-  "tipi_version": 2,
+  "tipi_version": 3,
   "version": "git-90503be",
   "categories": ["ai"],
   "description": "Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline.",
diff --git a/apps/open-webui/docker-compose.json b/apps/open-webui/docker-compose.json
index 8a40005d..041bb8e6 100644
--- a/apps/open-webui/docker-compose.json
+++ b/apps/open-webui/docker-compose.json
@@ -1,17 +1,20 @@
 {
-  "openPort": true,
-  "image": "ghcr.io/open-webui/open-webui:git-90503be",
-  "name": "open-webui",
-  "internalPort": "8080",
-  "isMain": true,
-  "volumes": [
+  "services": [
     {
-      "hostPath": "${APP_DATA_DIR}/data",
-      "containerPath": "/app/backend/data"
+      "image": "ghcr.io/open-webui/open-webui:git-90503be",
+      "name": "open-webui",
+      "internalPort": 8080,
+      "isMain": true,
+      "volumes": [
+        {
+          "hostPath": "${APP_DATA_DIR}/data",
+          "containerPath": "/app/backend/data"
+        }
+      ],
+      "environment": {
+        "OLLAMA_BASE_URL": "${OPENWEBUI_OLLAMA_URL}",
+        "OPENAI_API_KEY": "${OPENWEBUI_OPENAI_KEY}"
+      }
     }
-  ],
-  "environment": {
-    "OLLAMA_BASE_URL": "${OPENWEBUI_OLLAMA_URL}",
-    "OPENAI_API_KEY": "${OPENWEBUI_OPENAI_KEY}"
-  }
+  ]
 }