From 905a767c7d3ac0a698c59b9de52fa9814d1604d8 Mon Sep 17 00:00:00 2001
From: al-lac <lackner.alex@gmail.com>
Date: Sat, 21 Dec 2024 15:07:57 +0100
Subject: [PATCH 1/9] App Submission: Open WebUI

---
 open-webui/data/ollama/.gitkeep     |  0
 open-webui/data/open-webui/.gitkeep |  0
 open-webui/docker-compose.yml       | 22 ++++++++++++++++++++++
 open-webui/umbrel-app.yml           | 25 +++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 open-webui/data/ollama/.gitkeep
 create mode 100644 open-webui/data/open-webui/.gitkeep
 create mode 100644 open-webui/docker-compose.yml
 create mode 100644 open-webui/umbrel-app.yml

diff --git a/open-webui/data/ollama/.gitkeep b/open-webui/data/ollama/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/open-webui/data/open-webui/.gitkeep b/open-webui/data/open-webui/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
new file mode 100644
index 0000000000..fc86965c1d
--- /dev/null
+++ b/open-webui/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.6'
+
+services:
+  ollama:
+    image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37
+    volumes:
+      - ${APP_DATA_DIR}/data/ollama:/root/.ollama
+    ports:
+      - 11434:11434
+    restart: on-failure
+
+  open-webui:
+    image: ghcr.io/open-webui/open-webui:v0.4.8@sha256:c1e4f0927fb0acd53bcbd8bbc92ecaf7ca36a23ee4cb8f25ce90c541012a473a
+    volumes:
+      - ${APP_DATA_DIR}/data/open-webui:/app/backend/data
+    depends_on:
+      - ollama
+    ports:
+      - 2876:8080
+    environment:
+      - 'OLLAMA_BASE_URL=http://ollama:11434'
+    restart: on-failure
diff --git a/open-webui/umbrel-app.yml b/open-webui/umbrel-app.yml
new file mode 100644
index 0000000000..06969f524d
--- /dev/null
+++ b/open-webui/umbrel-app.yml
@@ -0,0 +1,25 @@
+manifestVersion: 1
+id: open-webui
+name: Open WebUI
+tagline: User-friendly AI Interface
+category: ai
+version: "0.4.8"
+port: 2876
+description: >-
+  🌐 Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline. 
+  
+  🤖 It supports various LLM runners, including Ollama and OpenAI-compatible APIs.
+
+  🦙 This app comes with ollama pre-installed and configured to run on port 11434.
+developer: Ollama
+website: https://openwebui.com/
+submitter: al-lac
+submission: https://github.com/getumbrel/umbrel-apps/pull/1977
+repo: https://github.com/open-webui/open-webui
+support: https://github.com/open-webui/open-webui/issues
+gallery: []
+defaultUsername: ""
+defaultPassword: ""
+dependencies: []
+releaseNotes: ""
+path: ""

From 35a7e6374a0e59fcc42ae424e8d9ed686d6efed4 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:33:24 +1000
Subject: [PATCH 2/9] add app_proxy, rename open-webui image, disable proxy
 auth

---
 open-webui/docker-compose.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index fc86965c1d..de5989b5a4 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -1,6 +1,12 @@
 version: '3.6'
 
 services:
+  app_proxy:
+    environment:
+      APP_HOST: open-webui_web_1
+      APP_PORT: 8080
+      PROXY_AUTH_ADD: "false"
+
   ollama:
     image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37
     volumes:
@@ -9,14 +15,12 @@ services:
       - 11434:11434
     restart: on-failure
 
-  open-webui:
+  web:
     image: ghcr.io/open-webui/open-webui:v0.4.8@sha256:c1e4f0927fb0acd53bcbd8bbc92ecaf7ca36a23ee4cb8f25ce90c541012a473a
     volumes:
       - ${APP_DATA_DIR}/data/open-webui:/app/backend/data
     depends_on:
       - ollama
-    ports:
-      - 2876:8080
     environment:
       - 'OLLAMA_BASE_URL=http://ollama:11434'
     restart: on-failure

From b3d078f9ab730dc2d03e161c2529778a1f431d81 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:33:56 +1000
Subject: [PATCH 3/9] Change compose version to 3.7 for umbrelOS 0.5
 compatibility

---
 open-webui/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index de5989b5a4..ce72b8a974 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.6'
+version: '3.7'
 
 services:
   app_proxy:

From 27e0b24e4be953f3f5056511a1f076e0817c851e Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:36:21 +1000
Subject: [PATCH 4/9] Use full container name for OLLAMA_BASE_URL to prevent
 issues if other ollama containers are running

---
 open-webui/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index ce72b8a974..86813dadfb 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -22,5 +22,5 @@ services:
     depends_on:
       - ollama
     environment:
-      - 'OLLAMA_BASE_URL=http://ollama:11434'
+      OLLAMA_BASE_URL: "http://open-webui_ollama_1:11434"
     restart: on-failure

From 079acc0c7b52f2ab82c58b6705c809d70c047fe1 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:38:35 +1000
Subject: [PATCH 5/9] Remove ollama container port bind to the host

---
 open-webui/docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index 86813dadfb..2b6e7561d7 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -11,8 +11,9 @@ services:
     image: ollama/ollama:0.5.4@sha256:18bfb1d605604fd53dcad20d0556df4c781e560ebebcd923454d627c994a0e37
     volumes:
       - ${APP_DATA_DIR}/data/ollama:/root/.ollama
-    ports:
-      - 11434:11434
+    # We could uncomment this if we want to expose the ollama port to the host for other external apps/programs to use. 
+    # ports:
+    #   - 11434:11434
     restart: on-failure
 
   web:

From b60546dab8bee7626938ddb7173b048b16c73128 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:39:24 +1000
Subject: [PATCH 6/9] Add whitespace to app description

---
 open-webui/umbrel-app.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/open-webui/umbrel-app.yml b/open-webui/umbrel-app.yml
index 06969f524d..e5b1a7f1d4 100644
--- a/open-webui/umbrel-app.yml
+++ b/open-webui/umbrel-app.yml
@@ -6,9 +6,11 @@ category: ai
 version: "0.4.8"
 port: 2876
 description: >-
-  🌐 Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline. 
+  🌐 Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline.
+
   
   🤖 It supports various LLM runners, including Ollama and OpenAI-compatible APIs.
+  
 
   🦙 This app comes with ollama pre-installed and configured to run on port 11434.
 developer: Ollama

From a0417c22baf9d927bd0bf026bcc8f2f9989fdb29 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:53:44 +1000
Subject: [PATCH 7/9] Add brief model download instructions

---
 open-webui/umbrel-app.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/open-webui/umbrel-app.yml b/open-webui/umbrel-app.yml
index e5b1a7f1d4..e37552b96d 100644
--- a/open-webui/umbrel-app.yml
+++ b/open-webui/umbrel-app.yml
@@ -8,11 +8,14 @@ port: 2876
 description: >-
   🌐 Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline.
 
-  
+
   🤖 It supports various LLM runners, including Ollama and OpenAI-compatible APIs.
-  
 
-  🦙 This app comes with ollama pre-installed and configured to run on port 11434.
+
+  🦙 This app comes packaged with [Ollama](https://ollama.com/) pre-configured to work out of the box. 
+  
+  To start downloading models via Ollama, simply type in a model name in the model search bar and click "Pull from Ollama.com".
+  A list of models can be found at https://ollama.com/search.
 developer: Ollama
 website: https://openwebui.com/
 submitter: al-lac

From 5b0c59973e11c6a96c78abd72971a71647f4feb4 Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 13:54:02 +1000
Subject: [PATCH 8/9] Add gallery assets

---
 open-webui/umbrel-app.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/open-webui/umbrel-app.yml b/open-webui/umbrel-app.yml
index e37552b96d..cd44ba95c7 100644
--- a/open-webui/umbrel-app.yml
+++ b/open-webui/umbrel-app.yml
@@ -22,9 +22,12 @@ submitter: al-lac
 submission: https://github.com/getumbrel/umbrel-apps/pull/1977
 repo: https://github.com/open-webui/open-webui
 support: https://github.com/open-webui/open-webui/issues
-gallery: []
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
 defaultUsername: ""
 defaultPassword: ""
 dependencies: []
 releaseNotes: ""
-path: ""
+path: ""
\ No newline at end of file

From 0bddabb487cd1de958dad053c36977792f5d973b Mon Sep 17 00:00:00 2001
From: nmfretz <nmfretz@gmail.com>
Date: Mon, 13 Jan 2025 14:55:23 +1000
Subject: [PATCH 9/9] bump to latest open-webui container

---
 open-webui/docker-compose.yml | 2 +-
 open-webui/umbrel-app.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/open-webui/docker-compose.yml b/open-webui/docker-compose.yml
index 2b6e7561d7..c1feb512d3 100644
--- a/open-webui/docker-compose.yml
+++ b/open-webui/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     restart: on-failure
 
   web:
-    image: ghcr.io/open-webui/open-webui:v0.4.8@sha256:c1e4f0927fb0acd53bcbd8bbc92ecaf7ca36a23ee4cb8f25ce90c541012a473a
+    image: ghcr.io/open-webui/open-webui:v0.5.4@sha256:42e8fa544facc38d731e3d516fbf478abe435bb4b80798e0934930afea6c5bab
     volumes:
       - ${APP_DATA_DIR}/data/open-webui:/app/backend/data
     depends_on:
diff --git a/open-webui/umbrel-app.yml b/open-webui/umbrel-app.yml
index cd44ba95c7..b5d2058399 100644
--- a/open-webui/umbrel-app.yml
+++ b/open-webui/umbrel-app.yml
@@ -3,7 +3,7 @@ id: open-webui
 name: Open WebUI
 tagline: User-friendly AI Interface
 category: ai
-version: "0.4.8"
+version: "0.5.4"
 port: 2876
 description: >-
   🌐 Open WebUI is an extensible, feature-rich, and user-friendly self-hosted WebUI designed to operate entirely offline.