From d313132c9767ce8417894bfb5a318ec69157098d Mon Sep 17 00:00:00 2001
From: armistace <ar17787@gmail.com>
Date: Wed, 23 Jul 2025 13:00:34 +1000
Subject: [PATCH] fix dockerfile

---
 Dockerfile       | 12 ------------
 mcpo_config.json | 18 ------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 mcpo_config.json

diff --git a/Dockerfile b/Dockerfile
index 5722d27..e61728a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ WORKDIR /mcpo
 
 COPY requirements.txt requirements.txt
 
-<<<<<<< HEAD
 COPY mcpo_config.yaml mcpo_config.yaml
 
 COPY config_builder.py config_builder.py
@@ -13,24 +12,13 @@ COPY gitea_mcp_set.sh gitea_mcp_set.sh
 
 COPY .env .env
 
-=======
-COPY mcpo_config.json mcpo_config.json
-
-COPY gitea_mcp_set.sh gitea_mcp_set.sh
-
->>>>>>> d186565 (first iteration of the service)
 RUN apt-get update -y && apt-get install -y python3 virtualenv wget tar python3-pip python3-pip
 
 RUN ./gitea_mcp_set.sh
 
 RUN pip install -r requirements.txt --break-system-packages
 
-<<<<<<< HEAD
 RUN python3 config_builder.py
 
 EXPOSE 8000
 ENTRYPOINT ["mcpo", "--config", "/mcpo/config.json"]
-=======
-EXPOSE 8000
-ENTRYPOINT ["mcpo", "--config", "/mcpo/mcpo_config.json"]
->>>>>>> d186565 (first iteration of the service)
diff --git a/mcpo_config.json b/mcpo_config.json
deleted file mode 100644
index 2ffd714..0000000
--- a/mcpo_config.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "mcpServers": {
-        "gitea_stdio": {
-            "command": "gitea-mcp",
-            "args": ["-t", "stdio", "--host", "https://git.aridgwayweb.com"],
-            "env": {
-                "GITEA_ACCESS_TOKEN": "bac6a1e753d6f2c0b848bd1cbad82965b43ea480"
-            }
-        },
-        "homeassistant": {
-            "type": "sse",
-            "url": "https://homeassistant.aridgwayweb.com/mcp_server/sse",
-            "headers": {
-                "Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIwZmM4ZTIyNGFlOGI0MGIxOWJmNWE2YzI3NmRkYTBkYiIsImlhdCI6MTc1MzE4MzUwNSwiZXhwIjoyMDY4NTQzNTA1fQ.At_LG5QAuIzeM470tTokbp-XIq3ytf7j5SsAmpoPrLk"
-            }
-        }
-    }
-}