Update Dockerfile

Dockerfile

@@ -1,25 +1,63 @@
 FROM ghcr.io/ggml-org/llama.cpp:full
 
+# Set up working directory and system dependencies
 WORKDIR /app
+RUN apt update && apt install -y wget python3 python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
 
-RUN apt update && apt install -y python3 python3-pip python3-venv
+# Create a dedicated directory to organize the models
+RUN mkdir -p /models
+
+# Create a virtual environment for Python tools
 RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
-
 RUN pip install -U pip huggingface_hub
 
+# --- DOWNLOAD FROM FIRST DOCKERFILE (Via wget) ---
+# Model 1: Gemma 4 Multimodal + Speculative Setup
+RUN wget "https://huggingface.co/unsloth/gemma-4-E2B-it-qat-GGUF/resolve/main/gemma-4-E2B-it-qat-UD-Q4_K_XL.gguf" -O /models/gemma-4-E2B-it-qat-UD-Q4_K_XL.gguf && \
+    wget "https://huggingface.co/unsloth/gemma-4-E2B-it-qat-GGUF/resolve/main/mtp-gemma-4-E2B-it.gguf" -O /models/mtp-gemma-4-E2B-it.gguf && \
+    wget "https://huggingface.co/unsloth/gemma-4-E2B-it-qat-GGUF/resolve/main/mmproj-F16.gguf" -O /models/gemma-4-E2B-it-mmproj.gguf
+
+# Model 2: Gemma 3 1B Model
+RUN wget "https://huggingface.co/MaziyarPanahi/gemma-3-1b-it-GGUF/resolve/main/gemma-3-1b-it.Q3_K_M.gguf" -O /models/gemma-3-1b-it.Q3_K_M.gguf
+
+# --- DOWNLOAD FROM SECOND DOCKERFILE (Via huggingface_hub) ---
+# Model 3: Gemma 4 26B Multimodal
 RUN python3 -c 'from huggingface_hub import hf_hub_download; \
     repo="unsloth/gemma-4-26B-A4B-it-GGUF"; \
-    hf_hub_download(repo_id=repo, filename="gemma-4-26B-A4B-it-UD-Q4_K_XL.gguf", local_dir="/app"); \
-    hf_hub_download(repo_id=repo, filename="mmproj-BF16.gguf", local_dir="/app")'
-
-CMD ["--server", \
-     "-m", "/app/gemma-4-26B-A4B-it-UD-Q4_K_XL.gguf", \
-     "--mmproj", "/app/mmproj-BF16.gguf", \
-     "--host", "0.0.0.0", \
-     "--port", "7860", \
-     "-t", "2", \
-     "--cache-type-k", "q8_0", \
-     "--cache-type-v", "iq4_nl", \
-     "-c", "64000", \
-     "-n", "38912"]
+    hf_hub_download(repo_id=repo, filename="gemma-4-26B-A4B-it-UD-Q4_K_XL.gguf", local_dir="/models"); \
+    hf_hub_download(repo_id=repo, filename="mmproj-BF16.gguf", local_dir="/models")'
+
+# --- MERGED ROUTER CONFIGURATION ---
+RUN echo "[gemma-4-vision]" > /models.ini && \
+    echo "model = /models/gemma-4-E2B-it-qat-UD-Q4_K_XL.gguf" >> /models.ini && \
+    echo "spec-draft-model = /models/mtp-gemma-4-E2B-it.gguf" >> /models.ini && \
+    echo "mmproj = /models/gemma-4-E2B-it-mmproj.gguf" >> /models.ini && \
+    echo "ctx-size = 4096" >> /models.ini && \
+    echo "flash-attn = on" >> /models.ini && \
+    echo "ubatch-size = 128" >> /models.ini && \
+    echo "batch-size = 512" >> /models.ini && \
+    echo "spec-type = draft-mtp" >> /models.ini && \
+    echo "spec-draft-n-max = 3" >> /models.ini && \
+    echo "" >> /models.ini && \
+    echo "[gemma-3-1b]" >> /models.ini && \
+    echo "model = /models/gemma-3-1b-it.Q3_K_M.gguf" >> /models.ini && \
+    echo "ctx-size = 4096" >> /models.ini && \
+    echo "flash-attn = on" >> /models.ini && \
+    echo "" >> /models.ini && \
+    echo "[gemma-4-26b-vision]" >> /models.ini && \
+    echo "model = /models/gemma-4-26B-A4B-it-UD-Q4_K_XL.gguf" >> /models.ini && \
+    echo "mmproj = /models/mmproj-BF16.gguf" >> /models.ini && \
+    echo "cache-type-k = q8_0" >> /models.ini && \
+    echo "cache-type-v = iq4_nl" >> /models.ini && \
+    echo "ctx-size = 64000" >> /models.ini
+
+# --- START SERVER IN ROUTER MODE ---
+# Note: "--server" is implicit when executing the entrypoint of the llama.cpp image with routing presets
+CMD [ \
+  "--models-preset", "/models.ini", \
+  "--port", "7860", \
+  "--host", "0.0.0.0", \
+  "-t", "2", \
+  "-tb", "2" \
+]