devops: go back to s390x dockerfile

Signed-off-by: Aaron Teo <[email protected]>

Author: taronaeo

.devops/s390x.Dockerfile

@@ -1,5 +1,5 @@
 ARG GCC_VERSION=15.2.0
-ARG DEBIAN_VERSION=12
+ARG UBUNTU_VERSION=24.04
 
 
 FROM --platform=linux/s390x gcc:${GCC_VERSION} AS build
@@ -10,7 +10,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
     apt upgrade -y && \
     apt install -y --no-install-recommends \
         git cmake ccache ninja-build \
-        python3 python3-pip python3-dev \
         libcurl4-openssl-dev libopenblas-openmp-dev && \
     rm -rf /var/lib/apt/lists/*
 
@@ -24,7 +23,7 @@ RUN --mount=type=cache,target=/root/.ccache \
         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
         -DLLAMA_BUILD_TESTS=OFF \
-        -DBUILD_SHARED_LIBS=OFF \
+        -DGGML_BACKEND_DL=OFF \
         -DGGML_NATIVE=OFF \
         -DGGML_BLAS=ON \
         -DGGML_BLAS_VENDOR=OpenBLAS && \
@@ -51,16 +50,16 @@ COPY --from=build /opt/llama.cpp/lib /llama.cpp/lib
 COPY --from=build /opt/llama.cpp/gguf-py /llama.cpp/gguf-py
 
 # Copy all shared libraries from distro
-COPY --from=build /usr/lib/s390x-linux-gnu /lib
+# COPY --from=build /usr/lib/s390x-linux-gnu /lib
 
 
-### Non-Hardened Base Target
-FROM --platform=linux/s390x debian:${DEBIAN_VERSION}-slim AS base
+### Base image
+FROM --platform=linux/s390x ubuntu:${UBUNTU_VERSION} AS base
 
 RUN --mount=type=cache,target=/var/cache/apt \
     --mount=type=cache,target=/var/lib/apt/lists \
     apt update -y && \
-    apt install -y libgomp1 curl && \
+    apt install -y curl libgomp1 libopenblas-dev && \
     apt autoremove -y && \
     apt clean -y && \
     rm -rf /tmp/* /var/tmp/* && \
@@ -71,42 +70,12 @@ RUN --mount=type=cache,target=/var/cache/apt \
 COPY --from=collector /llama.cpp/lib /usr/lib/s390x-linux-gnu
 
 # Copy all distro libraries
-COPY --from=collector /lib /lib/s390x-linux-gnu
-
-
-### Full
-# FROM base AS full
-
-# USER root:root
-# WORKDIR /app
-
-# # Fix rustc not found
-# ENV PATH="/root/.cargo/bin:${PATH}"
-
-# COPY --from=collector /llama.cpp/bin /app
-# COPY --from=collector /llama.cpp/gguf-py /app/gguf-py
-
-# RUN --mount=type=cache,target=/var/cache/apt \
-#     --mount=type=cache,target=/var/lib/apt/lists \
-#     apt update -y && \
-#     apt install -y --no-install-recommends \
-#         git python3 python3-pip python3-dev && \
-#     apt autoremove -y && \
-#     apt clean -y && \
-#     rm -rf /tmp/* /var/tmp/* && \
-#     find /var/cache/apt/archives /var/lib/apt/lists -not -name lock -type f -delete && \
-#     find /var/cache -type f -delete
-
-# RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-#     pip install -r /app/gguf-py/requirements.txt
-
-# ENTRYPOINT [ "/app/tools.sh" ]
+# COPY --from=collector /lib /lib/s390x-linux-gnu
 
 
 ### CLI Only
 FROM --platform=linux/s390x base AS light
 
-USER root:root
 WORKDIR /llama.cpp/bin
 
 # Copy llama.cpp binaries and libraries
@@ -118,24 +87,17 @@ ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]
 
 
 ### Hardened Server
-FROM --platform=linux/s390x gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot AS server
+FROM --platform=linux/s390x base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-USER nonroot:nonroot
 WORKDIR /llama.cpp/bin
 
 # Copy llama.cpp binaries and libraries
 COPY --from=collector /llama.cpp/bin/llama-server /llama.cpp/bin
-COPY --from=collector /llama.cpp/lib /usr/lib/s390x-linux-gnu
-
-# Fixes model loading errors
 COPY --from=collector /llama.cpp/bin/libggml-cpu.so /llama.cpp/bin
 COPY --from=collector /llama.cpp/bin/libggml-blas.so /llama.cpp/bin
 
-# Copy all distro libraries
-COPY --from=collector /lib /lib/s390x-linux-gnu
-
 EXPOSE 8080
 
 ENTRYPOINT [ "/llama.cpp/bin/llama-server" ]