From 8a75118a8cf4e1dd8e80f6fa07626e22bba1a0c7 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com>
Date: Fri, 30 Jun 2023 15:42:04 -0700
Subject: [PATCH] Update config handling to use envvars instead of FS overlay
 (#6)

* Update config handling to use envvars instead of FS overlay

* Update dependencies to stable versions
---
 Dockerfile                               |  5 +++++
 docker_overlay/etc/OpenVoiceOS/ovos.conf | 11 -----------
 requirements/requirements.txt            |  4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 docker_overlay/etc/OpenVoiceOS/ovos.conf

diff --git a/Dockerfile b/Dockerfile
index 51dc8e0..822d628 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
 FROM python:3.9-slim
 
+LABEL vendor=neon.ai \
+    ai.neon.name="neon-llm-chatgpt"
+
+ENV OVOS_CONFIG_BASE_FOLDER neon
+ENV OVOS_CONFIG_FILENAME diana.yaml
 ENV XDG_CONFIG_HOME /config
 COPY docker_overlay/ /
 
diff --git a/docker_overlay/etc/OpenVoiceOS/ovos.conf b/docker_overlay/etc/OpenVoiceOS/ovos.conf
deleted file mode 100644
index 46eba3c..0000000
--- a/docker_overlay/etc/OpenVoiceOS/ovos.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "module_overrides": {
-        "diana": {
-            "base_folder": "neon",
-            "config_filename": "diana.yaml"
-        }
-    },
-    "submodule_mappings": {
-        "neon_llm_chatgpt": "diana"
-    }
-}
\ No newline at end of file
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 1f12555..a769c8b 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,4 +1,4 @@
 openai~=0.27
-neon-mq-connector>=0.6.1a9,~=0.6
+neon-mq-connector~=0.7
 ovos-utils~=0.0.32
-ovos-config~=0.0.8
\ No newline at end of file
+ovos-config~=0.0.10
\ No newline at end of file