From dd73ce620f1a8aeff9d6eaf94c406b9ea046b4f6 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 10 Nov 2022 16:08:31 -0500
Subject: [PATCH] Docker update

---
 docker-standalone/Dockerfile.base      | 1 -
 docker-standalone/Dockerfile.koboldai  | 3 ---
 docker-standalone/docker-helper_new.sh | 6 ++----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/docker-standalone/Dockerfile.base b/docker-standalone/Dockerfile.base
index 3265efbd..41209c2a 100644
--- a/docker-standalone/Dockerfile.base
+++ b/docker-standalone/Dockerfile.base
@@ -5,7 +5,6 @@ COPY ./install_requirements.sh /opt/koboldai
 USER root
 RUN apt update && apt install wget aria2 git bzip2 python3 python3-venv -y
 RUN ./install_requirements.sh cuda;rm -rf ~/.cache/pip
-RUN git clone https://github.com/db0/KoboldAI-Horde-Bridge /opt/koboldai/KoboldAI-Horde/
 RUN python3 -m venv /opt/koboldai/KoboldAI-Horde/venv
 RUN /opt/koboldai/KoboldAI-Horde/venv/bin/pip install -r /opt/koboldai/KoboldAI-Horde/requirements.txt
 ENV PATH=/opt/conda/bin/:$PATH
diff --git a/docker-standalone/Dockerfile.koboldai b/docker-standalone/Dockerfile.koboldai
index 45a2b8fa..b22abf84 100644
--- a/docker-standalone/Dockerfile.koboldai
+++ b/docker-standalone/Dockerfile.koboldai
@@ -6,7 +6,4 @@ ENV override_delete=true
 ENV override_rename=true
 ENV update=true
 COPY . /opt/koboldai
-WORKDIR /opt/koboldai/KoboldAI-Horde/
-RUN git pull
-WORKDIR /opt/koboldai/
 CMD ./docker-standalone/docker-helper.sh
\ No newline at end of file
diff --git a/docker-standalone/docker-helper_new.sh b/docker-standalone/docker-helper_new.sh
index 70dc76b9..61bf553e 100644
--- a/docker-standalone/docker-helper_new.sh
+++ b/docker-standalone/docker-helper_new.sh
@@ -2,9 +2,6 @@
 cd /opt/koboldai
 if [[ -n update ]];then
 	git pull
-	cd KoboldAI-Horde/
-	git pull
-	cd ..
 fi
 
 #The goal here is to allow any directory in /content to be mapped to the appropriate dir in the koboldai dir
@@ -16,7 +13,8 @@ for FILE in *;do
 	if [[ -d "/opt/koboldai/$FILE" ]];then
 		rm -rf /opt/koboldai/$FILE
 	fi
-	ln -s /content/$FILE /opt/koboldai/$FILE
+	#ln -s /content/$FILE /opt/koboldai/$FILE
+	mount --bind /content/$FILE /opt/koboldai/$FILE
 done