From: Diego Devesa <redacted>
Date: Sat, 25 Jan 2025 14:22:29 +0000 (+0100)
Subject: docker : fix CPU ARM build (#11403)
X-Git-Tag: upstream/0.0.4631~80
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=20a758155bc5f37290b20ea44d76ba99c4e7f2cb;p=pkg%2Fggml%2Fsources%2Fllama.cpp

docker : fix CPU ARM build (#11403)

* docker : fix CPU ARM build

* add CURL to other builds
---

diff --git a/.devops/cpu.Dockerfile b/.devops/cpu.Dockerfile
index 8d020f16..ab0e951b 100644
--- a/.devops/cpu.Dockerfile
+++ b/.devops/cpu.Dockerfile
@@ -2,6 +2,8 @@ ARG UBUNTU_VERSION=22.04
 
 FROM ubuntu:$UBUNTU_VERSION AS build
 
+ARG TARGETARCH
+
 RUN apt-get update && \
     apt-get install -y build-essential git cmake libcurl4-openssl-dev
 
@@ -9,7 +11,11 @@ WORKDIR /app
 
 COPY . .
 
-RUN cmake -S . -B build -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_CURL=ON -DCMAKE_BUILD_TYPE=Release && \
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON -DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON; \
+    else \
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DLLAMA_CURL=ON; \
+    fi && \
     cmake --build build -j $(nproc)
 
 RUN mkdir -p /app/lib && \