diff --git a/other/vllm/Docker/Dockerfile.base b/other/vllm/Docker/Dockerfile.base index 28b35ea..bcd4d6f 100644 --- a/other/vllm/Docker/Dockerfile.base +++ b/other/vllm/Docker/Dockerfile.base @@ -24,9 +24,9 @@ RUN cp /tmp/rathole /app RUN python3 -m venv /venv RUN /venv/bin/pip3 install --upgrade pip setuptools wheel -# Install PyTorch before installing VLLM in an attempt to ensure we use the right -# version for our CUDA install. (VLLM wants 2.0.1) -RUN /venv/bin/pip3 install torch==2.0.1 --index-url https://download.pytorch.org/whl/cu118 +# Install PyTorch before installing VLLM to ensure we use the right version for our CUDA install. +RUN wget -q -O - https://raw.githubusercontent.com/vllm-project/vllm/main/requirements.txt | grep -E 'torch*' > /tmp/torch_version +RUN /venv/bin/pip3 install "$(cat /tmp/torch_version)" --index-url https://download.pytorch.org/whl/cu118 # WORKDIR /local-llm-server diff --git a/other/vllm/Docker/build-docker.sh b/other/vllm/Docker/build-docker.sh index eb560bf..f95ad4f 100644 --- a/other/vllm/Docker/build-docker.sh +++ b/other/vllm/Docker/build-docker.sh @@ -2,6 +2,6 @@ # Build and push the container. -git pull -sudo docker build . -f Dockerfile.base -t cyberes/vllm-paperspace-base --no-cache && sudo docker push cyberes/vllm-paperspace-base:latest +git pull || exit +sudo docker build . -f Dockerfile.base -t cyberes/vllm-paperspace-base --no-cache && sudo docker push cyberes/vllm-paperspace-base:latest || exit sudo docker build . -t cyberes/vllm-paperspace && sudo docker push cyberes/vllm-paperspace:latest