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

Reviewed-on: #92

jellyfin/jellyfin-secret.json

@@ -1,6 +1,6 @@
 {
     "jellyfin": {
-        "USER": "#JELLYFIN_USER",
+        "USER": "#USER",
-        "PASS": "#JELLYFIN_PASS"
+        "PASS": "#PASS"
     }
 }

leantime/leantime-secret.json

@@ -1,15 +1,15 @@
 {
     "leantimemysql": {
-        "MARIADB_DATABASE": "#DB_MYSQL",
+        "MARIADB_DATABASE": "#MARIADB_DATABASE",
-        "MARIADB_USER": "#DB_USER",
+        "MARIADB_USER": "#MARIADB_USER",
-        "MARIADB_PASSWORD": "#DB_PASSWORD",
+        "MARIADB_PASSWORD": "#MARIADB_PASSWORD",
-        "MARIADB_ROOT_PASSWORD": "#DB_ROOT_PASSWORD"
+        "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD"
     },
     "leantimeapp": {
-        "LEAN_DB_USER": "#DB_USER",
+        "LEAN_DB_USER": "#MARIADB_USER",
-        "LEAN_DB_PASSWORD": "#DB_PASSWORD",
+        "LEAN_DB_PASSWORD": "#MARIADB_PASSWORD",
         "LEAN_DB_HOST": "leantimemysql-db",
-        "LEAN_DB_DATABASE": "#DB_MYSQL",
+        "LEAN_DB_DATABASE": "#MARIADB_DATABASE",
         "LEAN_OIDC_CLIENT_SECRET": "#OIDC_CLIENT_SECRET",
         "LEAN_S3_SECRET": "#S3_SECRET",
         "LEAN_SESSION_PASSWORD": "#SESSION_PASSWORD"

leantime/template.json

@@ -35,28 +35,28 @@
         },
         {
             "description": "MYSQL database name",
-            "key": "DB_MYSQL",
+            "key": "MARIADB_DATABASE",
             "value": "",
             "required": "true",
             "generated": "time|md5|10"
         },
         {
             "description": "MYSQL username",
-            "key": "DB_USER",
+            "key": "MARIADB_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "MYSQL password for user",
-            "key": "DB_PASSWORD",
+            "key": "MARIADB_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
             "description": "MYSQL root user password",
-            "key": "DB_ROOT_PASSWORD",
+            "key": "MARIADB_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"

openwebui/domain-openwebui.json

@@ -0,0 +1,60 @@
+{
+    "main": {
+        "SERVICE_NAME": "openwebui",
+        "DOMAIN": "#DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "openwebui-app"
+                },
+                {
+                    "PORT": "8080"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}

openwebui/firewall-openwebui-dns.json

@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "coredns"
+                },
+                {
+                    "TARGET": "openwebui-app"
+                },
+                {
+                    "TYPE": "udp"
+                },
+                {
+                    "TARGET_PORT": "53"
+                },
+                {
+                    "COMMENT": "dns for openwebui"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}

openwebui/firewall-openwebui.json

@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "smarthostbackend"
+                },
+                {
+                    "TARGET": "openwebui-app"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "8080"
+                },
+                {
+                    "COMMENT": "proxy for openwebui"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}

openwebui/openwebui-secret.json

@@ -0,0 +1,16 @@
+{
+    "openwebuipostgres": {
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
+    },
+    "openwebuiapp": {
+        "WEBUI_ADMIN_NAME": "#WEBUI_ADMIN_NAME",
+        "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

@@ -0,0 +1,196 @@
+{
+    "main": {
+        "SERVICE_NAME": "openwebui",
+        "DOMAIN": "#DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "alpine:latest",
+            "UPDATE": "true",
+            "NAME": "openwebui-init",
+            "NETWORK": "host",
+            "MEMORY": "64M",
+            "VOLUMES": [
+                {
+                    "SOURCE": "USER_DATA",
+                    "DEST": "/etc/user/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "ENTRYPOINT": "sh -c",
+            "CMD": "mkdir -p /etc/user/data/openwebui/data && mkdir -p /etc/user/data/openwebui/db && mkdir -p /etc/user/data/openwebui/pipelines && mkdir -p /etc/user/data/openwebui/qdrant",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "postgres:16-alpine",
+            "UPDATE": "true",
+            "NAME": "openwebuipostgres-db",
+            "MEMORY": "256M",
+            "NETWORK": "openwebui-net",
+            "SELECTOR": "openwebuipostgres-db",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/openwebui/db",
+                    "DEST": "/var/lib/postgresql/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "5432",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/openwebui/openwebui.json"
+            ],
+            "EXTRA": "--restart always",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "qdrant/qdrant:latest",
+            "UPDATE": "true",
+            "NAME": "openwebui-qdrant",
+            "MEMORY": "1024M",
+            "NETWORK": "openwebui-net",
+            "SELECTOR": "openwebui-qdrant",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/openwebui/qdrant",
+                    "DEST": "/qdrant/storage",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "6333",
+                    "TYPE": "tcp"
+                },
+                {
+                    "SOURCE": "null",
+                    "DEST": "6334",
+                    "TYPE": "tcp"
+                }
+            ],
+            "EXTRA": "--restart always",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "ghcr.io/open-webui/pipelines:main",
+            "UPDATE": "true",
+            "NAME": "openwebui-pipelines",
+            "MEMORY": "1024M",
+            "NETWORK": "openwebui-net",
+            "SELECTOR": "openwebui-pipelines",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/openwebui/pipelines",
+                    "DEST": "/app/pipelines",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "9099",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENVS": [
+                {
+                    "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
+                },
+                {
+                    "VECTOR_DB": "qdrant"
+                },
+                {
+                    "QDRANT_HOST": "openwebui-qdrant"
+                },
+                {
+                    "QDRANT_PORT": "6333"
+                },
+                {
+                    "QDRANT_URI": "http://openwebui-qdrant:6333"
+                }
+            ],
+            "EXTRA": "--restart always",
+            "DEPEND": [],
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
+        {
+            "IMAGE": "ghcr.io/open-webui/open-webui:main",
+            "UPDATE": "true",
+            "NAME": "openwebuiapp",
+            "MEMORY": "4096M",
+            "NETWORK": "openwebui-net",
+            "SELECTOR": "openwebui-app",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/openwebui/data",
+                    "DEST": "/app/data",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "8080",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENVS": [
+                {
+                    "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
+                },
+                {
+                    "VECTOR_DB": "qdrant"
+                },
+                {
+                    "QDRANT_HOST": "openwebui-qdrant"
+                },
+                {
+                    "QDRANT_PORT": "6333"
+                },
+                {
+                    "QDRANT_URI": "http://openwebui-qdrant:6333"
+                },
+                {
+                    "ENABLE_RAG_PIPELINE": "True"
+                },
+                {
+                    "RAG_PIPELINE_URL": "http://openwebui-pipelines:9099/v1"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/openwebui/openwebui.json"
+            ],
+            "EXTRA": "--restart always",
+            "DEPEND": [],
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": [
+                "firewall-openwebui",
+                "domain-openwebui",
+                "firewall-openwebui-dns"
+            ]
+        }
+    ]
+}

openwebui/template.json

@@ -0,0 +1,87 @@
+{
+    "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,PHN2ZyB3aWR0aD0iNTgiIGhlaWdodD0iNTkiIHZpZXdCb3g9IjAgMCA1OCA1OSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjBfZF85XzYyKSI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIxX2RfOV82MikiPgo8cmVjdCB4PSI0IiB5PSIxIiB3aWR0aD0iNTAiIGhlaWdodD0iNTAiIHJ4PSI3IiBmaWxsPSJ3aGl0ZSIvPgo8L2c+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzUuMTcxNyAyNS43NUMzNS4xNzE3IDMxLjEzNDEgMzAuODc5NiAzNS41IDI1LjU4NTMgMzUuNUMyMC4yOTIyIDM1LjUgMTYgMzEuMTM0MSAxNiAyNS43NUMxNiAyMC4zNjU4IDIwLjI5MjIgMTYgMjUuNTg1MyAxNkMzMC44Nzk2IDE2IDM1LjE3MTcgMjAuMzY1OCAzNS4xNzE3IDI1Ljc1Wk0zMS4yMzI3IDI1Ljc1QzMxLjIzMjcgMjguOTIyIDI4LjcwNDIgMzEuNDkyNyAyNS41ODUzIDMxLjQ5MjdDMjIuNDY3NSAzMS40OTI3IDE5LjkzOSAyOC45MjIgMTkuOTM5IDI1Ljc1QzE5LjkzOSAyMi41NzggMjIuNDY3NSAyMC4wMDcyIDI1LjU4NTMgMjAuMDA3MkMyOC43MDUzIDIwLjAwNzIgMzEuMjMyNyAyMi41NzggMzEuMjMyNyAyNS43NVoiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNDIuMDAwMSAxNkgzOC4zMjMyVjM1LjVINDIuMDAwMVYxNloiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfZF85XzYyIiB4PSIyIiB5PSIwIiB3aWR0aD0iNTQiIGhlaWdodD0iNTQiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldCBkeT0iMSIvPgo8ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIxIi8+CjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9Im91dCIvPgo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4yNSAwIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0iZWZmZWN0MV9kcm9wU2hhZG93XzlfNjIiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2Ryb3BTaGFkb3dfOV82MiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyMV9kXzlfNjIiIHg9IjAiIHk9IjEiIHdpZHRoPSI1OCIgaGVpZ2h0PSI1OCIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVDb2xvck1hdHJpeCBpbj0iU291cmNlQWxwaGEiIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAxMjcgMCIgcmVzdWx0PSJoYXJkQWxwaGEiLz4KPGZlT2Zmc2V0IGR5PSI0Ii8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0ib3V0Ii8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjI1IDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJlZmZlY3QxX2Ryb3BTaGFkb3dfOV82MiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd185XzYyIiByZXN1bHQ9InNoYXBlIi8+CjwvZmlsdGVyPgo8L2RlZnM+Cjwvc3ZnPgo=",
+    "fields": [
+        {
+            "description": "Domain",
+            "key": "DOMAIN",
+            "value": "",
+            "required": "true"
+        },
+        {
+            "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 displayed username for Open WebUI.",
+            "required": "true"
+        },
+        {
+            "description": "Admin password",
+            "key": "WEBUI_ADMIN_PASSWORD",
+            "value": "",
+            "info": "The initial admin password for Open WebUI.",
+            "required": "true",
+            "type": "password"
+        },
+        {
+            "description": "OpenAI compatible API endpoint",
+            "key": "OPENAI_API_BASE_URL",
+            "value": "",
+            "info": "Optional API url for OpenAI compatible API endpoint.",
+            "advanced": "true"
+        },
+        {
+            "description": "WebUI secret key",
+            "key": "WEBUI_SECRET_KEY",
+            "value": "",
+            "required": "true",
+            "generated": "openssl|hex|32"
+        },
+        {
+            "description": "OpenAI API key",
+            "key": "OPENAI_API_KEY",
+            "value": "",
+            "info": "Optional API key for OpenAI compatible API endpoint.",
+            "advanced": "true",
+            "type": "password"
+        },
+        {
+            "description": "Postgres database name",
+            "key": "POSTGRES_DB",
+            "value": "",
+            "required": "true",
+            "generated": "time|md5|8"
+        },
+        {
+            "description": "Postgres username",
+            "key": "POSTGRES_USER",
+            "value": "",
+            "required": "true",
+            "generated": "time|md5|8"
+        },
+        {
+            "description": "Postgres password for user",
+            "key": "POSTGRES_PASSWORD",
+            "value": "",
+            "required": "true",
+            "generated": "random|md5|12"
+        },
+        {
+            "description": "Postgres root user password",
+            "key": "POSTGRES_ROOT_PASSWORD",
+            "value": "",
+            "required": "true",
+            "generated": "random|sha256|20"
+        }
+    ]
+}

outline/outline-secret.json

@@ -1,13 +1,14 @@
 {
     "outlinepostgres": {
-        "POSTGRES_DB": "#DB_NAME",
+        "POSTGRES_DB": "#POSTGRES_DB",
-        "POSTGRES_USER": "#DB_USER",
+        "POSTGRES_USER": "#POSTGRES_USER",
-        "POSTGRES_PASSWORD": "#DB_PASSWORD"
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "outlineapp": {
         "SECRET_KEY": "#SECRET_KEY",
         "UTILS_SECRET": "#UTILS_SECRET",
-        "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@outlinepostgres-db:5432/#DB_NAME",
+        "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@outlinepostgres-db:5432/#POSTGRES_DB",
         "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
         "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
         "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",

outline/template.json

@@ -21,28 +21,28 @@
         },
         {
             "description": "Postgres database name",
-            "key": "DB_NAME",
+            "key": "POSTGRES_DB",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres username",
-            "key": "DB_USER",
+            "key": "POSTGRES_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres password for user",
-            "key": "DB_PASSWORD",
+            "key": "POSTGRES_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
             "description": "Postgres root user password",
-            "key": "DB_ROOT_PASSWORD",
+            "key": "POSTGRES_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"

quackback/quackback-secret.json

@@ -1,8 +1,9 @@
 {
     "quackbackpostgres": {
-        "POSTGRES_DB": "#DB_NAME",
+        "POSTGRES_DB": "#POSTGRES_DB",
-        "POSTGRES_USER": "#DB_USER",
+        "POSTGRES_USER": "#POSTGRES_USER",
-        "POSTGRES_PASSWORD": "#DB_PASSWORD"
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "quackbackminio": {
         "MINIO_ROOT_USER": "#MINIO_ROOT_USER",
@@ -11,7 +12,7 @@
     "quackbackapp": {
         "SECRET_KEY": "#SECRET_KEY",
         "UTILS_SECRET": "#UTILS_SECRET",
-        "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@quackbackpostgres-db:5432/#DB_NAME",
+        "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@quackbackpostgres-db:5432/#POSTGRES_DB",
         "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
         "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
         "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",

quackback/service-quackback.json

@@ -26,7 +26,7 @@
             "POST_START": "null"
         },
         {
-            "IMAGE": "postgres-quackback:18",
+            "IMAGE": "safebox/postgres-quackback:18",
             "UPDATE": "true",
             "NAME": "quackbackpostgres-db",
             "MEMORY": "256M",
@@ -35,7 +35,7 @@
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/quackback/db",
-                    "DEST": "/var/lib/postgresql/data",
+                    "DEST": "/var/lib/postgresql",
                     "TYPE": "rw"
                 }
             ],
@@ -96,7 +96,7 @@
             "IMAGE": "docker.dragonflydb.io/dragonflydb/dragonfly:v1.27.1",
             "UPDATE": "true",
             "NAME": "quackbackredis-server",
-            "MEMORY": "128M",
+            "MEMORY": "4096M",
             "NETWORK": "quackback-net",
             "SELECTOR": "quackbackredis",
             "PORTS": [
@@ -138,8 +138,9 @@
             "POST_START": "null"
         },
         {
-            "IMAGE": "safebox/quackback:latest",
+            "IMAGE": "safebox/quackback:#VERSION",
             "UPDATE": "true",
+            "MEMORY": "4096M",
             "NAME": "quackbackapp",
             "NETWORK": "quackback-net",
             "SELECTOR": "quackback-app",
@@ -176,10 +177,10 @@
                     "S3_ENDPOINT": "http://quackbackminio-app:9000"
                 },
                 {
-                    "S3_BUCKET": "quackback"
+                    "S3_BUCKET": "#S3_BUCKET"
                 },
                 {
-                    "S3_REGION": "europe-east-1"
+                    "S3_REGION": "#S3_REGION"
                 },
                 {
                     "S3_FORCE_PATH_STYLE": "true"