Update Dockerfile

Dockerfile

@@ -35,7 +35,6 @@ RUN mkdir -p /home/user/code/models && \
     cd /home/user/code/models && \
     wget -q https://huggingface.co/Mungert/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-q6_k_m.gguf
 
-
 # Clone and build OpenBLAS as the non-root user
 RUN git clone https://github.com/OpenMathLib/OpenBLAS.git /home/user/code/models/OpenBLAS && \
     cd /home/user/code/models/OpenBLAS && \
@@ -50,6 +49,23 @@ RUN cd /home/user/code/models/OpenBLAS && \
 # Switch back to the non-root user
 USER user
 
+# Clone llama.cpp as the non-root user
+RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp
+
+
+
+# Install .NET 10.0 as the non-root user
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+    chmod +x dotnet-install.sh && \
+    ./dotnet-install.sh --channel 10.0
+
+# Set persistent environment variables
+ENV DOTNET_ROOT=/home/user/.dotnet
+ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
+
+# Verify .NET installation and current user
+RUN whoami && dotnet --version
+
 # Clone repositories using the GITHUB_TOKEN secret
 RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
     git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLib.git /home/user/code/NetworkMonitorLib && \
@@ -62,29 +78,13 @@ RUN git -C /home/user/code/models/llama.cpp apply \
 #        /home/user/code/NetworkMonitorLLM/patches/qwen35_session_tokens_insert_fix.diff \
 #        /home/user/code/NetworkMonitorLLM/patches/qwen35_mrope_kv_restore_fix.diff
 
-# Clone and build llama.cpp with OpenBLAS support as the non-root user
-RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp && \
-    cd /home/user/code/models/llama.cpp && \
+# Build llama.cpp with OpenBLAS support after patches
+RUN cd /home/user/code/models/llama.cpp && \
     export PKG_CONFIG_PATH=/opt/OpenBLAS/lib/pkgconfig:$PKG_CONFIG_PATH && \
     cmake -B build -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS=/home/user/code/models/OpenBLAS -DLLAMA_CURL=OFF && \
     cmake --build build --config Release -j2 && \
     cp /home/user/code/models/llama.cpp/build/bin/* /home/user/code/models/llama.cpp/
 
-
-
-# Install .NET 10.0 as the non-root user
-RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
-    chmod +x dotnet-install.sh && \
-    ./dotnet-install.sh --channel 10.0
-
-# Set persistent environment variables
-ENV DOTNET_ROOT=/home/user/.dotnet
-ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
-
-# Verify .NET installation and current user
-RUN whoami && dotnet --version
-
-
 # Copy files into the container as the non-root user
 COPY --chown=user:user appsettings.json /home/user/code/app/appsettings.json
 COPY --chown=user:user index.html /home/user/code/app/wwwroot/index.html
@@ -110,4 +110,3 @@ RUN cp -r /home/user/code/NetworkMonitorLLM/bin/Release/net10.0/* /home/user/cod
 WORKDIR /home/user/code/app
 
 CMD ["dotnet", "NetworkMonitorLLM.dll", "--urls", "http://0.0.0.0:7860"]
-