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,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",
+    "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",