From 73ae750b73bbdad691a4fcd83a0770a05f6ce861 Mon Sep 17 00:00:00 2001
From: wangxingjun778 <wangxingjun778@163.com>
Date: Tue, 16 Sep 2025 22:46:58 +0800
Subject: [PATCH] fix install.sh using bash in Dockerfile.ubuntu

---
 docker/Dockerfile.ubuntu |  2 +-
 docker/install.sh        | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index f72e4cc9..5e1a1b6b 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -56,7 +56,7 @@ fi
 ARG CUR_TIME={cur_time}
 RUN echo $CUR_TIME
 
-RUN sh /tmp/install.sh {version_args} && \
+RUN bash /tmp/install.sh {version_args} && \
     curl -fsSL https://ollama.com/install.sh | sh && \
     pip install --no-cache-dir -U funasr scikit-learn && \
     pip install --no-cache-dir -U qwen_vl_utils qwen_omni_utils librosa timm transformers accelerate peft trl safetensors && \
diff --git a/docker/install.sh b/docker/install.sh
index 3b88f396..661dcc81 100644
--- a/docker/install.sh
+++ b/docker/install.sh
@@ -25,14 +25,11 @@ pip install --no-cache-dir flash_attn==$flashattn_version
 
 pip install --no-cache-dir triton auto-gptq==$autogptq_version -U && pip cache purge
 
-pip install --no-cache-dir vllm==$vllm_version && pip cache purge
-
-#if [[ "$(printf '%s\n' "0.6.0" "$vllm_version" | sort -V | head -n1)" = "0.6.0" ]]; then
-#    # vllm_version is >= 0.6.0
-#    echo ">>Debug: Condition met: vllm_version >= 0.6.0, proceeding with installation..."
-#    pip install --no-cache-dir vllm==$vllm_version && pip cache purge
-#else
-#    echo ">>Debug: Condition not met: vllm_version < 0.6.0, skipping installation. (vllm_version = $vllm_version)"
-#fi
+if [[ "$(printf '%s\n' "0.6.0" "$vllm_version" | sort -V | head -n1)" = "0.6.0" ]]; then
+    # vllm_version is >= 0.6.0
+    pip install --no-cache-dir vllm==$vllm_version && pip cache purge
+else
+    echo "vllm_version < 0.6.0, skipping installation. (vllm_version = $vllm_version)"
+fi
 
 # pip uninstall -y torch-scatter && TORCH_CUDA_ARCH_LIST="6.0;6.1;6.2;7.0;7.5;8.0;8.6;8.9;9.0" pip install --no-cache-dir -U torch-scatter