From 361b22cc8be177f52c8da7c8fde17492e1b9cf5b Mon Sep 17 00:00:00 2001
From: ifsheldon <39153080+ifsheldon@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:21:49 +0800
Subject: [PATCH 1/2] add vllm-openai-modelscope

---
 Dockerfile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 8be03b3567f0..bf6fc4d85439 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -127,3 +127,17 @@ COPY vllm vllm
 
 ENTRYPOINT ["python3", "-m", "vllm.entrypoints.openai.api_server"]
 #################### OPENAI API SERVER ####################
+
+#################### OPENAI API SERVER with ModelScope ####################
+# openai api server alternative
+FROM vllm-base AS vllm-openai-modelscope
+# install additional dependencies for openai api server with modelscope
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install accelerate hf_transfer modelscope
+
+COPY --from=build /workspace/vllm/*.so /workspace/vllm/
+COPY vllm vllm
+
+ENV VLLM_USE_MODELSCOPE=True
+ENTRYPOINT ["python3", "-m", "vllm.entrypoints.openai.api_server"]
+#################### OPENAI API SERVER ####################

From 0ce1cff39500a947fea3f51490a388a6414bd276 Mon Sep 17 00:00:00 2001
From: ifsheldon <39153080+ifsheldon@users.noreply.github.com>
Date: Mon, 18 Mar 2024 11:21:23 +0800
Subject: [PATCH 2/2] Add modelscope to vllm-openai

---
 Dockerfile | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bf6fc4d85439..8007dfe25ced 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -119,25 +119,11 @@ RUN --mount=type=bind,from=flash-attn-builder,src=/usr/src/flash-attention-v2,ta
 # openai api server alternative
 FROM vllm-base AS vllm-openai
 # install additional dependencies for openai api server
-RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install accelerate hf_transfer
-
-COPY --from=build /workspace/vllm/*.so /workspace/vllm/
-COPY vllm vllm
-
-ENTRYPOINT ["python3", "-m", "vllm.entrypoints.openai.api_server"]
-#################### OPENAI API SERVER ####################
-
-#################### OPENAI API SERVER with ModelScope ####################
-# openai api server alternative
-FROM vllm-base AS vllm-openai-modelscope
-# install additional dependencies for openai api server with modelscope
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install accelerate hf_transfer modelscope
 
 COPY --from=build /workspace/vllm/*.so /workspace/vllm/
 COPY vllm vllm
 
-ENV VLLM_USE_MODELSCOPE=True
 ENTRYPOINT ["python3", "-m", "vllm.entrypoints.openai.api_server"]
 #################### OPENAI API SERVER ####################