devops : add llama in all docker images (#25035)

Signed-off-by: Adrien Gallouët <redacted>

diff --git a/.devops/cann.Dockerfile b/.devops/cann.Dockerfile
index dc95e3f38d85a25d48c5baabdef3ded02c282e27..36cee7bdb631ba531c82102aff2c51ea01d0c33b 100644 (file)
--- a/.devops/cann.Dockerfile
+++ b/.devops/cann.Dockerfile
@@ -145,7 +145,7 @@ ENTRYPOINT ["/app/tools.sh"]
 # ==============================================================================
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 ENTRYPOINT [ "/app/llama-cli" ]
 
@@ -156,7 +156,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 HEALTHCHECK --interval=5m CMD [ "curl", "-f", "http://localhost:8080/health" ]
 

diff --git a/.devops/cpu.Dockerfile b/.devops/cpu.Dockerfile
index caf727bcdbe540c596f70163dc076ef886be9333..cb92343d6c0725906d55aadf10625fd72bdaf667 100644 (file)
--- a/.devops/cpu.Dockerfile
+++ b/.devops/cpu.Dockerfile
@@ -104,7 +104,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -115,7 +115,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/cuda.Dockerfile b/.devops/cuda.Dockerfile
index b16b9a8f1a6fbdc51bdcb61b73c79a6715d25c86..c9a498d538b3a8cc663436571728c68282597d97 100644 (file)
--- a/.devops/cuda.Dockerfile
+++ b/.devops/cuda.Dockerfile
@@ -113,7 +113,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -124,7 +124,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/intel.Dockerfile b/.devops/intel.Dockerfile
index 3c059eb3013af540c9c9422c0bd692d5930d4a1c..b4bcd94b9264330ddfb890bdb9ff8c9496195ca0 100644 (file)
--- a/.devops/intel.Dockerfile
+++ b/.devops/intel.Dockerfile
@@ -141,7 +141,7 @@ ENTRYPOINT ["/app/tools.sh"]
 FROM base AS light
 
 COPY --from=build /app/lib/ /app
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -153,7 +153,7 @@ FROM base AS server
 ENV LLAMA_ARG_HOST=0.0.0.0
 
 COPY --from=build /app/lib/ /app
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/musa.Dockerfile b/.devops/musa.Dockerfile
index 0c23cc554705d7f1680b6da1741b24400c2f46d9..d30a70bb364cb651b8e680756d36b2dd0bd80fad 100644 (file)
--- a/.devops/musa.Dockerfile
+++ b/.devops/musa.Dockerfile
@@ -115,7 +115,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -126,7 +126,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/openvino.Dockerfile b/.devops/openvino.Dockerfile
index bcaea16cc3f164706e7a26345f9949d2b5edc2df..9b2784b664e9ce3f29ba928de04c241512aaa16b 100644 (file)
--- a/.devops/openvino.Dockerfile
+++ b/.devops/openvino.Dockerfile
@@ -214,7 +214,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
 
 WORKDIR /app
 
@@ -225,7 +225,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app/
 
 WORKDIR /app
 

diff --git a/.devops/rocm.Dockerfile b/.devops/rocm.Dockerfile
index 7fad0c22e5a166744bf4648740d09c17c37eb0bf..a8bc4e1fcd642a60140980a9e10d4cdf5ca37353 100644 (file)
--- a/.devops/rocm.Dockerfile
+++ b/.devops/rocm.Dockerfile
@@ -127,7 +127,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -138,7 +138,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/s390x.Dockerfile b/.devops/s390x.Dockerfile
index d88dd2d92dc929e872f9a7a0042e44799e39f889..94a715ff2d48e3bda93e410d2fa8658b1453fa79 100644 (file)
--- a/.devops/s390x.Dockerfile
+++ b/.devops/s390x.Dockerfile
@@ -124,7 +124,7 @@ WORKDIR /llama.cpp/bin
 
 # Copy llama.cpp binaries and libraries
 COPY --from=collector /llama.cpp/bin/*.so /llama.cpp/bin
-COPY --from=collector /llama.cpp/bin/llama-cli /llama.cpp/bin/llama-completion /llama.cpp/bin
+COPY --from=collector /llama.cpp/bin/llama /llama.cpp/bin/llama-cli /llama.cpp/bin/llama-completion /llama.cpp/bin
 
 ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]
 
@@ -138,7 +138,7 @@ WORKDIR /llama.cpp/bin
 
 # Copy llama.cpp binaries and libraries
 COPY --from=collector /llama.cpp/bin/*.so /llama.cpp/bin
-COPY --from=collector /llama.cpp/bin/llama-server /llama.cpp/bin
+COPY --from=collector /llama.cpp/bin/llama /llama.cpp/bin/llama-server /llama.cpp/bin
 
 EXPOSE 8080
 

diff --git a/.devops/vulkan.Dockerfile b/.devops/vulkan.Dockerfile
index 26c1902b14f5c974ccbb9c16a8fe69ad1532a783..d3599ffb82c0f95887f98982d639ef0184231f2c 100644 (file)
--- a/.devops/vulkan.Dockerfile
+++ b/.devops/vulkan.Dockerfile
@@ -107,7 +107,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -118,7 +118,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app
 

diff --git a/.devops/zendnn.Dockerfile b/.devops/zendnn.Dockerfile
index 80daf56710a4788b3cf1af1bd843ffa7752ca536..8a50b3ef6a13aabab74ef2adfe6c3f2c756cd43f 100644 (file)
--- a/.devops/zendnn.Dockerfile
+++ b/.devops/zendnn.Dockerfile
@@ -97,7 +97,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light
 
-COPY --from=build /app/full/llama-cli /app/full/llama-completion /app
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app
 
 WORKDIR /app
 
@@ -108,7 +108,7 @@ FROM base AS server
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
-COPY --from=build /app/full/llama-server /app
+COPY --from=build /app/full/llama /app/full/llama-server /app
 
 WORKDIR /app