diff --git a/other/vllm/Docker/Dockerfile b/other/vllm/Docker/Dockerfile index da878ce..50a364e 100644 --- a/other/vllm/Docker/Dockerfile +++ b/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 diff --git a/other/vllm/Docker/start-vllm.sh b/other/vllm/Docker/start-vllm.sh index c35b3a4..c086e25 100644 --- a/other/vllm/Docker/start-vllm.sh +++ b/other/vllm/Docker/start-vllm.sh @@ -1,15 +1,8 @@ #!/bin/bash -# Kill old processes -pids1=$(ps aux | grep '[b]ash /app/start-vllm.sh' | awk '{print $2}') -pids2=$(ps aux | grep '/venv/bin/python /local-llm-server/other/vllm/vllm_api_server.py' | awk '{print $2}') - -# Kill the processes -for pid in $pids1; do - kill -9 $pid -done - -for pid in $pids2; do +# Kill old process +vllm_pid=$(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 -9 $pid done diff --git a/other/vllm/Docker/supervisord.conf b/other/vllm/Docker/supervisord.conf index c0fc170..ad427b0 100644 --- a/other/vllm/Docker/supervisord.conf +++ b/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 @@ -28,4 +28,4 @@ command=/jupyterlab/bin/jupyter lab --allow-root --ip=0.0.0.0 --no-browser --Ser environment=JUPYTER_CONFIG_DIR="/app/jupyter",SHELL="/bin/bash" [program:ssh] -command=/usr/sbin/sshd -D \ No newline at end of file +command=/usr/sbin/sshd -D