Update Dockerfile

Dockerfile

@@ -1,105 +1,163 @@
 # syntax=docker/dockerfile:1.4
-# Use the official Debian base image
-FROM debian:13
 
-# Set environment variables to avoid interactive prompts during package installation
+# ============================================================
+# Stage 1: Build llama.cpp
+# ============================================================
+FROM debian:13 AS llama-build
+
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install system-level dependencies as root
 RUN apt-get update && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
         build-essential \
-        curl \
-        ca-certificates \
-        git \
         cmake \
-        clang \
+        git \
         pkg-config \
-        ccache \
+        libopenblas-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+
+RUN git clone --depth 1 https://github.com/ggml-org/llama.cpp.git
+
+WORKDIR /build/llama.cpp
+
+RUN cmake -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DGGML_BLAS=ON \
+        -DGGML_BLAS_VENDOR=OpenBLAS \
+        -DLLAMA_CURL=OFF && \
+    cmake --build build --config Release -j2
+
+RUN mkdir -p /out/llama && \
+    cp -a build/bin/. /out/llama/
+
+
+# ============================================================
+# Stage 2: Build .NET application
+# ============================================================
+FROM debian:13 AS dotnet-build
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
         wget \
-        vim \
+        git \
         libicu76 \
-        expect
+        libssl3t64 && \
+    rm -rf /var/lib/apt/lists/*
 
-# Create a non-root user and set up their environment
-RUN useradd -m user && \
-    mkdir -p /home/user/code && \
-    chown -R user:user /home/user
+RUN useradd -m user
 
-# Switch to the non-root user
 USER user
 WORKDIR /home/user
 
-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/Mellum2-12B-A2.5B-Instruct-GGUF/resolve/main/Mellum2-12B-A2.5B-Instruct-mxfp4_moe.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 && \
-    make -j2 > build.log 2>&1 || (tail -20 build.log && false)
-
-# Switch to root for the OpenBLAS installation
-USER root
-RUN cd /home/user/code/models/OpenBLAS && \
-    make install > install.log 2>&1 || (tail -20 install.log && false) && \
-    cp /opt/OpenBLAS/lib/libopenblas* /usr/local/lib/
-
-# Switch back to the non-root user
-USER user
+RUN wget -q https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+    chmod +x dotnet-install.sh && \
+    ./dotnet-install.sh --channel 10.0 && \
+    rm dotnet-install.sh
 
-# Clone llama.cpp as the non-root user
-RUN git clone https://github.com/ggerganov/llama.cpp /home/user/code/models/llama.cpp
+ENV DOTNET_ROOT=/home/user/.dotnet
+ENV PATH="${PATH}:${DOTNET_ROOT}:${DOTNET_ROOT}/tools"
 
+WORKDIR /home/user/code
 
+RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
+    git clone --depth 1 \
+        https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLib.git \
+        /home/user/code/NetworkMonitorLib && \
+    git clone --depth 1 \
+        https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git \
+        /home/user/code/NetworkMonitorLLM
 
-# 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
+WORKDIR /home/user/code/NetworkMonitorLLM
 
-# Set persistent environment variables
-ENV DOTNET_ROOT=/home/user/.dotnet
-ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
+RUN dotnet restore && \
+    dotnet publish \
+        -c Release \
+        --no-self-contained \
+        -o /out/app
 
-# 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 && \
-    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/Mungert69/NetworkMonitorLLM.git /home/user/code/NetworkMonitorLLM 
+# ============================================================
+# Stage 3: Runtime image
+# ============================================================
+FROM debian:13 AS runtime
 
+ENV DEBIAN_FRONTEND=noninteractive
 
-# 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/
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        wget \
+        curl \
+        libicu76 \
+        libssl3t64 \
+        libgssapi-krb5-2 \
+        libstdc++6 \
+        libgcc-s1 \
+        libopenblas0-pthread \
+        expect \
+        tzdata && \
+    rm -rf /var/lib/apt/lists/*
 
-# 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
+RUN useradd -m user && \
+    mkdir -p \
+        /home/user/code/app/wwwroot \
+        /home/user/code/models/llama.cpp \
+        /home/user/code/models && \
+    chown -R user:user /home/user
 
+USER user
+WORKDIR /home/user
 
-# Set the working directory for the build-qwen-3 script
-WORKDIR /home/user/code/models
+# Install only the ASP.NET Core runtime - NOT the full SDK
+RUN wget -q https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+    chmod +x dotnet-install.sh && \
+    ./dotnet-install.sh \
+        --channel 10.0 \
+        --runtime aspnetcore && \
+    rm dotnet-install.sh
 
+ENV DOTNET_ROOT=/home/user/.dotnet
+ENV PATH="${PATH}:${DOTNET_ROOT}:${DOTNET_ROOT}/tools"
 
-# Expose port 7860 for Hugging Face Spaces
-EXPOSE 7860
-# Set the working directory
-WORKDIR /home/user/code/NetworkMonitorLLM
+# Copy only the compiled llama.cpp binaries
+COPY --from=llama-build --chown=user:user \
+    /out/llama/ \
+    /home/user/code/models/llama.cpp/
 
-# Build the .NET project as the non-root user
-RUN dotnet restore && \
-    dotnet build -c Release
+# Copy only the published .NET application
+COPY --from=dotnet-build --chown=user:user \
+    /out/app/ \
+    /home/user/code/app/
+
+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
 
-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 
 
-# Set the working directory to the `app` directory
+# ============================================================
+# Model
+# ============================================================
+WORKDIR /home/user/code/models
+
+RUN wget -q \
+    https://huggingface.co/Mungert/Mellum2-12B-A2.5B-Instruct-GGUF/resolve/main/Mellum2-12B-A2.5B-Instruct-mxfp4_moe.gguf \
+    -O Mellum2-12B-A2.5B-Instruct-mxfp4_moe.gguf
+
+
+# ============================================================
+# Application
+# ============================================================
 WORKDIR /home/user/code/app
 
-CMD ["dotnet", "NetworkMonitorLLM.dll", "--urls", "http://0.0.0.0:7860"]
+EXPOSE 7860
+
+CMD ["dotnet", "NetworkMonitorLLM.dll", "--urls", "http://0.0.0.0:7860"]