From bc74a3dc502be4e39fe86f0e872848ea8db5b8c8 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Sun, 15 Oct 2023 16:50:04 -0600
Subject: [PATCH] docker: get working

---
 other/vllm/Docker/Dockerfile         |  4 ++--
 other/vllm/Docker/build-docker.sh    |  2 +-
 other/vllm/Docker/start-container.sh |  2 +-
 other/vllm/Docker/supervisord.conf   | 10 +++++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/other/vllm/Docker/Dockerfile b/other/vllm/Docker/Dockerfile
index b8f5df1..8146cef 100644
--- a/other/vllm/Docker/Dockerfile
+++ b/other/vllm/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM cyberes/paperspace-vllm-base as runtime
+FROM cyberes/vllm-paperspace-base as runtime
 
 RUN useradd -ms /bin/bash apiserver
 RUN usermod -s /bin/bash root
@@ -26,7 +26,7 @@ RUN sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/s
 # Create the necessary directory for sshd
 RUN mkdir /var/run/sshd
 
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY supervisord.conf /etc/supervisor/supervisord.conf
 COPY start-vllm.sh /app/start-vllm.sh
 COPY init-container.sh /app/init.sh
 COPY start-container.sh /app/start.sh
diff --git a/other/vllm/Docker/build-docker.sh b/other/vllm/Docker/build-docker.sh
index b439dd9..78f861f 100644
--- a/other/vllm/Docker/build-docker.sh
+++ b/other/vllm/Docker/build-docker.sh
@@ -4,5 +4,5 @@
 
 git pull
 git pull
-sudo docker build . -f Dockerfile.base -t cyberes/paperspace-vllm-base --no-cache && sudo docker push cyberes/paperspace-vllm-base:latest
+sudo docker build . -f Dockerfile.base -t cyberes/vllm-paperspace-base --no-cache && sudo docker push cyberes/vllm-paperspace-base:latest
 sudo docker build . -t cyberes/vllm-paperspace && sudo docker push cyberes/vllm-paperspace:latest
diff --git a/other/vllm/Docker/start-container.sh b/other/vllm/Docker/start-container.sh
index 401f9f6..05587a1 100644
--- a/other/vllm/Docker/start-container.sh
+++ b/other/vllm/Docker/start-container.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Start the services and launch the container.
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
diff --git a/other/vllm/Docker/supervisord.conf b/other/vllm/Docker/supervisord.conf
index d7ea848..800cb27 100644
--- a/other/vllm/Docker/supervisord.conf
+++ b/other/vllm/Docker/supervisord.conf
@@ -1,9 +1,17 @@
 [supervisord]
 nodaemon = true
-pidfile = /tmp/supervisord.pid
+user=root
+pidfile = /var/run/supervisord.pid
 logfile = /var/log/app/supervisord.log
 directory = /tmp
 
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0770
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
 [supervisorctl]
 serverurl=unix:///var/run/supervisor.sock