fix docker

other/vllm/Docker/Dockerfile

@@ -59,8 +59,7 @@ COPY --from=build /app /app
 COPY --from=build /jupyterlab /jupyterlab
 RUN cp /local-llm-server/other/vllm/Docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
-RUN echo '' > /app/start-vllm.sh
+COPY ./start-vllm.sh /app/start-vllm.sh
-
 COPY ./rathole-client.toml /app/client.toml
 COPY ./jupyter /app/jupyter
 COPY ./ssh /root/.ssh

other/vllm/Docker/start-vllm.sh

@@ -1,15 +1,8 @@
 #!/bin/bash
 
-# Kill old processes
+# Kill old process
-pids1=$(ps aux | grep '[b]ash /app/start-vllm.sh' | awk '{print $2}')
+vllm_pid=$(ps aux | grep '/venv/bin/python /local-llm-server/other/vllm/vllm_api_server.py' | awk '{print $2}')
-pids2=$(ps aux | grep '/venv/bin/python /local-llm-server/other/vllm/vllm_api_server.py' | awk '{print $2}')
+for pid in $vllm_pid; do
-
-# Kill the processes
-for pid in $pids1; do
-  kill -9 $pid
-done
-
-for pid in $pids2; do
   kill -9 $pid
 done
 

other/vllm/Docker/supervisord.conf

@@ -2,7 +2,7 @@
 nodaemon=true
 
 [program:vllm_server]
-command=bash /app/start-vllm.sh 2>&1 | tee /var/log/app/vllm.log
+command=/bin/bash -c 'bash /app/start-vllm.sh 2>&1 | tee /var/log/app/vllm.log'
 autostart=true
 autorestart=true
 stdout_logfile=/dev/fd/1
@@ -13,7 +13,7 @@ user=apiserver
 environment=HOME="/home/apiserver",USER="apiserver"
 
 [program:rathole]
-command=/app/rathole -c /app/client.toml 2>&1 | tee /var/log/app/rathole.log
+command=/bin/bash -c 'app/rathole -c /app/client.toml 2>&1 | tee /var/log/app/rathole.log'
 autostart=true
 autorestart=true
 stdout_logfile=/dev/fd/1