Merge pull request 'added admin email address to openwebui' (#92) from dev into main

Reviewed-on: #92

openwebui/openwebui-secret.json

@@ -7,8 +7,8 @@
     },
     "openwebuiapp": {
         "WEBUI_ADMIN_NAME": "#WEBUI_ADMIN_NAME",
-        "WEBUI_ADMIN_PASSWORD": "#WEBUI_ADMIN_PASSWORD",
         "WEBUI_ADMIN_EMAIL": "#WEBUI_ADMIN_EMAIL",
+        "WEBUI_ADMIN_PASSWORD": "#WEBUI_ADMIN_PASSWORD",
         "WEBUI_SECRET_KEY": "#WEBUI_SECRET_KEY",
         "OPENAI_API_KEY": "#OPENAI_API_KEY",
         "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@openwebuipostgres-db:5432/#POSTGRES_DB"

openwebui/service-openwebui.json

@@ -60,7 +60,7 @@
             "IMAGE": "qdrant/qdrant:latest",
             "UPDATE": "true",
             "NAME": "openwebui-qdrant",
-            "MEMORY": "256M",
+            "MEMORY": "1024M",
             "NETWORK": "openwebui-net",
             "SELECTOR": "openwebui-qdrant",
             "VOLUMES": [
@@ -93,7 +93,7 @@
             "IMAGE": "ghcr.io/open-webui/pipelines:main",
             "UPDATE": "true",
             "NAME": "openwebui-pipelines",
-            "MEMORY": "256M",
+            "MEMORY": "1024M",
             "NETWORK": "openwebui-net",
             "SELECTOR": "openwebui-pipelines",
             "VOLUMES": [
@@ -137,8 +137,8 @@
         {
             "IMAGE": "ghcr.io/open-webui/open-webui:main",
             "UPDATE": "true",
-            "NAME": "openwebui",
+            "NAME": "openwebuiapp",
-            "MEMORY": "512M",
+            "MEMORY": "4096M",
             "NETWORK": "openwebui-net",
             "SELECTOR": "openwebui-app",
             "VOLUMES": [
@@ -157,19 +157,7 @@
             ],
             "ENVS": [
                 {
-                    "WEBUI_ADMIN_NAME": "#WEBUI_ADMIN_NAME"
+                    "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
-                },
-                {
-                    "WEBUI_ADMIN_PASSWORD": "#WEBUI_ADMIN_PASSWORD"
-                },
-                {
-                    "WEBUI_ADMIN_EMAIL": "#WEBUI_ADMIN_EMAIL"
-                },
-                {
-                    "OPENAI_API_BASE_URL": "http://192.168.2.2:8080/v1"
-                },
-                {
-                    "OPENAI_API_KEY": "#OPENAI_API_KEY"
                 },
                 {
                     "VECTOR_DB": "qdrant"

openwebui/template.json

@@ -1,9 +1,9 @@
 {
-    "name": "openwebui",
+    "name": "OpenWebUI",
     "title": "Open WebUI",
     "subtitle": "AI Chat Interface",
     "description": "Open WebUI is a user-friendly WebUI for LLMs (formerly Ollama WebUI). It supports various LLM runners including OpenAI compatible APIs, with features like RAG, multi-modal support, and a powerful pipeline system.",
-    "icon": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTAiIGhlaWdodD0iNTAiIHZpZXdCb3g9IjAgMCA1MCA1MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI1IDNDMTIuODUgMyAzIDEyLjg1IDMgMjVDMyAzNy4xNSAxMi44NSA0NyAyNSA0N0MzNy4xNSA0NyA0NyAzNy4xNSA0NyAyNUM0NyAxMi44NSAzNy4xNSAzIDI1IDNaTTI1IDYuM0MzNS4zNSA2LjMgNDMuNyAxNC42NSA0My43IDI1QzQzLjcgMzUuMzUgMzUuMzUgNDMuNyAyNSA0My43QzE0LjY1IDQzLjcgNi4zIDM1LjM1IDYuMyAyNUM2LjMgMTQuNjUgMTQuNjUgNi4zIDI1IDYuMzhaTTI1IDkuNUMxNi40IDkuNSA5LjUgMTYuNCA5LjUgMjVDOS41IDMzLjYgMTYuNCA0MC41IDI1IDQwLjVDMzMuNiA0MC41IDQwLjUgMzMuNiA0MC41IDI1QzQwLjUgMTYuNCAzMy42IDkuNSAyNSA5LjVaTTI1IDEyLjhDMzEuNzUgMTIuOCAzNy4yIDE4LjI1IDM3LjIgMjVDMzcuMiAzMS43NSAzMS43NSAzNy4yIDI1IDM3LjJDMTguMjUgMzcuMiAxMi44IDMxLjc1IDEyLjggMjVDMTIuOCAxOC4yNSAxOC4yNSAxMi44IDI1IDEyLjhaTTI1IDE2LjFDMTkuNTkgMTYuMSAxNS4yIDIwLjQ5IDE1LjIgMjVDMTUuMiAzMC40MSAxOS41OSAzNC44IDI1IDM0LjhDMzAuNDEgMzQuOCAzNC44IDMwLjQxIDM0LjggMjVDMzQuOCAyMC40OSAzMC40MSAxNi4xIDI1IDE2LjFaTTI1IDE5LjRDMjguMDkgMTkuNCAzMC42IDIxLjkxIDMwLjYgMjVDMzAuNiAyOC4wOSAyOC4wOSAzMC42IDI1IDMwLjZDMjEuOTEgMzAuNiAxOS40IDI4LjA5IDE5LjQgMjVDMTkuNCAyMS45MSAyMS45MSAxOS40IDI1IDE5LjRaTTI1IDIyLjdDMjMuNzMgMjIuNyAyMi43IDIzLjczIDIyLjcgMjVDMjIuNyAyNi4yNyAyMy43MyAyNy4zIDI1IDI3LjNDMjYuMjcgMjcuMyAyNy4zIDI2LjI3IDI3LjMgMjVDMjcuMyAyMy43MyAyNi4yNyAyMi43IDI1IDIyLjdaTTI1IDI2QzI0LjQ1IDI2IDI0IDI1LjU1IDI0IDI1QzI0IDI0LjQ1IDI0LjQ1IDI0IDI1IDI0QzI1LjU1IDI0IDI2IDI0LjQ1IDI2IDI1QzI2IDI1LjU1IDI1LjU1IDI2IDI1IDI2WiIgZmlsbD0iIzI5NzlGRSIvPgo8L3N2Zz4K",
+    "icon": "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTgiIGhlaWdodD0iNTkiIHZpZXdCb3g9IjAgMCA1OCA1OSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjBfZF85XzYyKSI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIxX2RfOV82MikiPgo8cmVjdCB4PSI0IiB5PSIxIiB3aWR0aD0iNTAiIGhlaWdodD0iNTAiIHJ4PSI3IiBmaWxsPSJ3aGl0ZSIvPgo8L2c+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzUuMTcxNyAyNS43NUMzNS4xNzE3IDMxLjEzNDEgMzAuODc5NiAzNS41IDI1LjU4NTMgMzUuNUMyMC4yOTIyIDM1LjUgMTYgMzEuMTM0MSAxNiAyNS43NUMxNiAyMC4zNjU4IDIwLjI5MjIgMTYgMjUuNTg1MyAxNkMzMC44Nzk2IDE2IDM1LjE3MTcgMjAuMzY1OCAzNS4xNzE3IDI1Ljc1Wk0zMS4yMzI3IDI1Ljc1QzMxLjIzMjcgMjguOTIyIDI4LjcwNDIgMzEuNDkyNyAyNS41ODUzIDMxLjQ5MjdDMjIuNDY3NSAzMS40OTI3IDE5LjkzOSAyOC45MjIgMTkuOTM5IDI1Ljc1QzE5LjkzOSAyMi41NzggMjIuNDY3NSAyMC4wMDcyIDI1LjU4NTMgMjAuMDA3MkMyOC43MDUzIDIwLjAwNzIgMzEuMjMyNyAyMi41NzggMzEuMjMyNyAyNS43NVoiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNDIuMDAwMSAxNkgzOC4zMjMyVjM1LjVINDIuMDAwMVYxNloiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfZF85XzYyIiB4PSIyIiB5PSIwIiB3aWR0aD0iNTQiIGhlaWdodD0iNTQiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldCBkeT0iMSIvPgo8ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIxIi8+CjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9Im91dCIvPgo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4yNSAwIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0iZWZmZWN0MV9kcm9wU2hhZG93XzlfNjIiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2Ryb3BTaGFkb3dfOV82MiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyMV9kXzlfNjIiIHg9IjAiIHk9IjEiIHdpZHRoPSI1OCIgaGVpZ2h0PSI1OCIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVDb2xvck1hdHJpeCBpbj0iU291cmNlQWxwaGEiIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAxMjcgMCIgcmVzdWx0PSJoYXJkQWxwaGEiLz4KPGZlT2Zmc2V0IGR5PSI0Ii8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0ib3V0Ii8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjI1IDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJlZmZlY3QxX2Ryb3BTaGFkb3dfOV82MiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd185XzYyIiByZXN1bHQ9InNoYXBlIi8+CjwvZmlsdGVyPgo8L2RlZnM+Cjwvc3ZnPgo=",
     "fields": [
         {
             "description": "Domain",
@@ -12,10 +12,17 @@
             "required": "true"
         },
         {
-            "description": "Admin username",
+            "description": "Admin email address",
+            "key": "WEBUI_ADMIN_EMAIL",
+            "value": "",
+            "info": "The initial admin email address for Open WebUI.",
+            "required": "true"
+        },
+        {
+            "description": "Displayed username",
             "key": "WEBUI_ADMIN_NAME",
             "value": "",
-            "info": "The initial admin username for Open WebUI.",
+            "info": "The initial displayed username for Open WebUI.",
             "required": "true"
         },
         {
@@ -26,13 +33,6 @@
             "required": "true",
             "type": "password"
         },
-        {
-            "description": "Admin email",
-            "key": "WEBUI_ADMIN_EMAIL",
-            "value": "",
-            "info": "The initial admin email for Open WebUI.",
-            "required": "true"
-        },
         {
             "description": "OpenAI compatible API endpoint",
             "key": "OPENAI_API_BASE_URL",
@@ -52,7 +52,8 @@
             "key": "OPENAI_API_KEY",
             "value": "",
             "info": "Optional API key for OpenAI compatible API endpoint.",
-            "advanced": "true"
+            "advanced": "true",
+            "type": "password"
         },
         {
             "description": "Postgres database name",