From bff187d717626f390f97ae01cd5853dee054bbe6 Mon Sep 17 00:00:00 2001 From: Aaron Teo Date: Tue, 9 Sep 2025 17:47:02 +0800 Subject: [PATCH] Revert "devops: formalise llama.cpp loc" This reverts commit 0a7664af8466a15f318ff209e02ac3c4e551cc18. Signed-off-by: Aaron Teo --- .devops/s390x.Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.devops/s390x.Dockerfile b/.devops/s390x.Dockerfile index 99e8d1a30f..b861f24354 100644 --- a/.devops/s390x.Dockerfile +++ b/.devops/s390x.Dockerfile @@ -57,7 +57,7 @@ RUN apt update -y \ # Copy llama.cpp libraries COPY --from=collector /lib/llama.cpp /usr/lib/s390x-linux-gnu -# Copy all distro libraries +# Copy all shared libraries COPY --from=collector /lib/distro /lib/s390x-linux-gnu @@ -65,14 +65,14 @@ COPY --from=collector /lib/distro /lib/s390x-linux-gnu FROM --platform=linux/s390x base AS light # Copy llama.cpp binaries and libraries -COPY --from=collector /bin/llama.cpp/llama-cli /llama.cpp/bin -COPY --from=collector /bin/llama.cpp/libggml-cpu.so /llama.cpp/bin -COPY --from=collector /bin/llama.cpp/libggml-blas.so /llama.cpp/bin +COPY --from=collector /bin/llama.cpp/llama-cli / +COPY --from=collector /bin/llama.cpp/libggml-cpu.so / +COPY --from=collector /bin/llama.cpp/libggml-blas.so / USER root:root WORKDIR /models -ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ] +ENTRYPOINT [ "/llama-cli" ] ### Hardened Server @@ -81,18 +81,18 @@ FROM --platform=linux/s390x gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot ENV LLAMA_ARG_HOST=0.0.0.0 # Copy llama.cpp binaries and libraries -COPY --from=collector /bin/llama.cpp/llama-server /llama.cpp/bin +COPY --from=collector /bin/llama.cpp/llama-server / COPY --from=collector /lib/llama.cpp /usr/lib/s390x-linux-gnu # Fixes model loading errors -COPY --from=collector /bin/llama.cpp/libggml-cpu.so /llama.cpp/bin -COPY --from=collector /bin/llama.cpp/libggml-blas.so /llama.cpp/bin +COPY --from=collector /bin/llama.cpp/libggml-cpu.so / +COPY --from=collector /bin/llama.cpp/libggml-blas.so / -# Copy all distro libraries +# Copy all shared libraries COPY --from=collector /lib/distro /lib/s390x-linux-gnu USER nonroot:nonroot WORKDIR /models EXPOSE 8080 -ENTRYPOINT [ "/llama.cpp/bin/llama-server" ] +ENTRYPOINT [ "/llama-server" ]