From a281f399035ddf5fc9da81e3067787213c24a662 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 10 Nov 2022 13:41:51 -0500
Subject: [PATCH] Move horde bridge system requirements to base docker image

---
 docker-standalone/Dockerfile.base     | 5 ++++-
 docker-standalone/Dockerfile.koboldai | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker-standalone/Dockerfile.base b/docker-standalone/Dockerfile.base
index efa5c319..27e7fea2 100644
--- a/docker-standalone/Dockerfile.base
+++ b/docker-standalone/Dockerfile.base
@@ -3,6 +3,9 @@ WORKDIR /opt/koboldai
 COPY ./environments /opt/koboldai/environments
 COPY ./install_requirements.sh /opt/koboldai
 USER root
-RUN apt update && apt install wget aria2 git bzip2 -y
+RUN apt update && apt install wget aria2 git bzip2 python3 python3-venv -y
 RUN ./install_requirements.sh cuda
+RUN python3 -m venv /opt/koboldai/KoboldAI-Horde/venv
+COPY ./KoboldAI-Horde/requirements.txt /opt/koboldai/KoboldAI-Horde/
+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 6121c838..b22abf84 100644
--- a/docker-standalone/Dockerfile.koboldai
+++ b/docker-standalone/Dockerfile.koboldai
@@ -5,9 +5,5 @@ ENV quiet=true
 ENV override_delete=true
 ENV override_rename=true
 ENV update=true
-RUN apt-get install python3 python3-venv -y
-RUN python3 -m venv /opt/koboldai/KoboldAI-Horde/venv
-COPY ./KoboldAI-Horde/requirements.txt /opt/koboldai/KoboldAI-Horde/
-RUN /opt/koboldai/KoboldAI-Horde/venv/bin/pip install -r /opt/koboldai/KoboldAI-Horde/requirements.txt
 COPY . /opt/koboldai
 CMD ./docker-standalone/docker-helper.sh
\ No newline at end of file