remove secrets from dockerfile, use /storage instead

This commit is contained in:
Cyberes 2023-09-28 17:02:45 -06:00
parent e1d3fca6d3
commit 89e9f42663
4 changed files with 16 additions and 6 deletions

View File

@ -63,9 +63,7 @@ RUN cp /local-llm-server/other/vllm/Docker/start-vllm.sh /app/start-vllm.sh
RUN cp /local-llm-server/other/vllm/Docker/start-container.sh /app/start.sh
# Copy your secrets in
COPY ./rathole-client.toml /app/client.toml
COPY ./jupyter /app/jupyter
COPY ./ssh /root/.ssh
# COPY ./jupyter /app/jupyter
RUN mkdir -p /var/log/app/

View File

@ -3,5 +3,11 @@
mkdir -p /storage/vllm/
chown -R apiserver:apiserver /storage/vllm
touch /storage/vllm/cmd.txt
touch /storage/vllm/rathole-client.toml
/usr/bin/supervisord
if [ -f /storage/vllm/ssh ]; then
cp -r /storage/vllm/ssh /root/.ssh
echo "Copied ssh from /storage"
fi
/usr/bin/supervisord

View File

@ -6,4 +6,9 @@ for pid in $vllm_pid; do
kill -9 $pid
done
cd /local-llm-server
git fetch
git reset --hard origin/master
/venv/bin/pip install -r requirements.txt
/venv/bin/python /local-llm-server/other/vllm/vllm_api_server.py --host 0.0.0.0 --port 7000 --max-log-len 100 $(cat /storage/vllm/cmd.txt)

View File

@ -13,7 +13,7 @@ user=apiserver
environment=HOME="/home/apiserver",USER="apiserver"
[program:rathole]
command=/bin/bash -c '/app/rathole -c /app/client.toml 2>&1 | tee -a /var/log/app/rathole.log'
command=/bin/bash -c '/app/rathole -c /storage/vllm/rathole-client.toml 2>&1 | tee -a /var/log/app/rathole.log'
autostart=true
autorestart=true
stdout_logfile=/dev/fd/1
@ -25,7 +25,8 @@ environment=HOME="/home/apiserver",USER="apiserver"
[program:jupyter]
command=/jupyterlab/bin/jupyter lab --allow-root --ip=0.0.0.0 --no-browser --ServerApp.trust_xheaders=True --ServerApp.disable_check_xsrf=False --ServerApp.allow_remote_access=True --ServerApp.allow_origin='*' --ServerApp.allow_credentials=True
environment=JUPYTER_CONFIG_DIR="/app/jupyter",SHELL="/bin/bash"
environment=SHELL="/bin/bash"
; JUPYTER_CONFIG_DIR="/app/jupyter"
[program:ssh]
command=/usr/sbin/sshd -D