Update Dockerfile

Dockerfile

@@ -1,11 +1,12 @@
 # syntax=docker/dockerfile:1.4
-# Use the official Debian 12 (Bookworm) base image
+
+# Use the official Debian 13 base image
 FROM debian:13
 
-# Set environment variables to avoid interactive prompts during package installation
+# Avoid interactive prompts during package installation
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install system-level dependencies as root
+# Install system dependencies
 RUN apt-get update && \
     apt-get install -y \
         build-essential \
@@ -21,92 +22,116 @@ RUN apt-get update && \
         libicu76 \
         expect
 
-# Create a non-root user and set up their environment
+# Create non-root user
 RUN useradd -m user && \
     mkdir -p /home/user/code && \
     chown -R user:user /home/user
 
-# Switch to the non-root user
+# Switch to non-root user
 USER user
 WORKDIR /home/user
 
+# Create directories and download model
 RUN mkdir -p /home/user/code/models && \
     mkdir -p /home/user/code/app/wwwroot && \
-    cd /home/user/code/models && \
-    wget -q https://huggingface.co/Mungert/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-q6_k_m.gguf
+    wget -q \
+      https://huggingface.co/Mungert/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-q6_k_m.gguf \
+      -O /home/user/code/models/Qwen3.5-2B-q6_k_m.gguf
 
-# Clone and build OpenBLAS as the non-root user
+# Clone and build OpenBLAS
 RUN git clone https://github.com/OpenMathLib/OpenBLAS.git /home/user/code/models/OpenBLAS && \
-    cd /home/user/code/models/OpenBLAS && \
-    make -j2 > build.log 2>&1 || (tail -20 build.log && false)
+    make -C /home/user/code/models/OpenBLAS -j2 \
+      > /home/user/code/models/OpenBLAS/build.log 2>&1 || \
+    (tail -20 /home/user/code/models/OpenBLAS/build.log && false)
 
-# Switch to root for the OpenBLAS installation
+# Switch to root for installation
 USER root
-RUN cd /home/user/code/models/OpenBLAS && \
-    make install > install.log 2>&1 || (tail -20 install.log && false) && \
+
+RUN make -C /home/user/code/models/OpenBLAS install \
+      > /home/user/code/models/OpenBLAS/install.log 2>&1 || \
+    (tail -20 /home/user/code/models/OpenBLAS/install.log && false) && \
     cp /opt/OpenBLAS/lib/libopenblas* /usr/local/lib/
 
-# Switch back to the non-root user
+# Switch back to 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
-
+# Clone llama.cpp and checkout specific commit
+RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp && \
+    git -C /home/user/code/models/llama.cpp checkout 5d14e5d
 
+# Install .NET 10
+RUN wget https://dot.net/v1/dotnet-install.sh \
+      -O /home/user/dotnet-install.sh && \
+    chmod +x /home/user/dotnet-install.sh && \
+    /home/user/dotnet-install.sh --channel 10.0
 
-# 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
+# Persistent .NET environment
 ENV DOTNET_ROOT=/home/user/.dotnet
 ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
 
-# Verify .NET installation and current user
+# Verify installation
 RUN whoami && dotnet --version
 
-# Clone repositories using the GITHUB_TOKEN secret
+# Clone private repositories
 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 && \
-    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git /home/user/code/NetworkMonitorLLM && \
-    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorData.git /home/user/code/NetworkMonitorData
-
-# Apply llama.cpp patches from NetworkMonitorLLM
+    git clone \
+      https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLib.git \
+      /home/user/code/NetworkMonitorLib && \
+    git clone \
+      https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git \
+      /home/user/code/NetworkMonitorLLM && \
+    git clone \
+      https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorData.git \
+      /home/user/code/NetworkMonitorData
+
+# Apply llama.cpp patches
 RUN git -C /home/user/code/models/llama.cpp apply \
-        /home/user/code/NetworkMonitorLLM/patches/qwen35_imrope_context_shift_fix.diff
-#        /home/user/code/NetworkMonitorLLM/patches/qwen35_session_tokens_insert_fix.diff \
-#        /home/user/code/NetworkMonitorLLM/patches/qwen35_mrope_kv_restore_fix.diff
-
-# 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/
-
-# 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
-
-
-# Set the working directory for the build-qwen-3 script
+      /home/user/code/NetworkMonitorLLM/patches/qwen35_imrope_context_shift_fix.diff
+
+# Build llama.cpp with OpenBLAS
+RUN export PKG_CONFIG_PATH=/opt/OpenBLAS/lib/pkgconfig:$PKG_CONFIG_PATH && \
+    cmake \
+      -S /home/user/code/models/llama.cpp \
+      -B /home/user/code/models/llama.cpp/build \
+      -DGGML_BLAS=ON \
+      -DGGML_BLAS_VENDOR=OpenBLAS \
+      -DBLAS_INCLUDE_DIRS=/home/user/code/models/OpenBLAS \
+      -DLLAMA_CURL=OFF && \
+    cmake --build /home/user/code/models/llama.cpp/build \
+      --config Release -j2 && \
+    cp /home/user/code/models/llama.cpp/build/bin/* \
+       /home/user/code/models/llama.cpp/
+
+# Copy application files
+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
+
+# Working directory for model-related tasks
 WORKDIR /home/user/code/models
 
-
-# Expose port 7860 for Hugging Face Spaces
+# Expose Hugging Face Spaces port
 EXPOSE 7860
-# Set the working directory
+
+# Switch to project directory
 WORKDIR /home/user/code/NetworkMonitorLLM
 
-# Build the .NET project as the non-root user
+# Restore and build .NET project
 RUN dotnet restore && \
     dotnet build -c Release
 
-RUN cp -r /home/user/code/NetworkMonitorLLM/bin/Release/net10.0/* /home/user/code/app/ && \
-    rm -rf /home/user/code/NetworkMonitorLib /home/user/code/NetworkMonitorLLM /home/user/code/NetworkMonitorData
+# Copy published files into app directory and clean up sources
+RUN cp -r /home/user/code/NetworkMonitorLLM/bin/Release/net10.0/* \
+          /home/user/code/app/ && \
+    rm -rf \
+      /home/user/code/NetworkMonitorLib \
+      /home/user/code/NetworkMonitorLLM \
+      /home/user/code/NetworkMonitorData
 
-# Set the working directory to the `app` directory
+# Final runtime directory
 WORKDIR /home/user/code/app
 
-CMD ["dotnet", "NetworkMonitorLLM.dll", "--urls", "http://0.0.0.0:7860"]
+# Start application
+CMD ["dotnet", "NetworkMonitorLLM.dll", "--urls", "http://0.0.0.0:7860"]