cyberes
/
local-llm-server
Archived
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix docker

This commit is contained in:
Cyberes 2023-09-27 16:57:14 -06:00
parent 74f16afa67
commit 3b0ec723a5
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
other/vllm/Docker/Dockerfile
View File

@ -59,8 +59,7 @@ COPY --from=build /app /app
COPY --from=build /jupyterlab /jupyterlab COPY --from=build /jupyterlab /jupyterlab
RUN cp /local-llm-server/other/vllm/Docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf 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 ./rathole-client.toml /app/client.toml
COPY ./jupyter /app/jupyter COPY ./jupyter /app/jupyter
COPY ./ssh /root/.ssh COPY ./ssh /root/.ssh

13
other/vllm/Docker/start-vllm.sh
View File

@ -1,15 +1,8 @@
#!/bin/bash #!/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 kill -9 $pid
done done

6
other/vllm/Docker/supervisord.conf
View File

@ -2,7 +2,7 @@
nodaemon=true nodaemon=true
[program:vllm_server] [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 autostart=true
autorestart=true autorestart=true
stdout_logfile=/dev/fd/1 stdout_logfile=/dev/fd/1
@ -13,7 +13,7 @@ user=apiserver
environment=HOME="/home/apiserver",USER="apiserver" environment=HOME="/home/apiserver",USER="apiserver"
[program:rathole] [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 autostart=true
autorestart=true autorestart=true
stdout_logfile=/dev/fd/1 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" environment=JUPYTER_CONFIG_DIR="/app/jupyter",SHELL="/bin/bash"
[program:ssh] [program:ssh]
command=/usr/sbin/sshd -D command=/usr/sbin/sshd -D