From a62dda3819aac32224aaa1f27d79f76ad0819ced Mon Sep 17 00:00:00 2001 From: David Thorpe Date: Sat, 10 Aug 2024 12:31:40 +0200 Subject: [PATCH] Fixed Makefile --- Dockerfile.llamacpp | 2 +- Makefile | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile.llamacpp b/Dockerfile.llamacpp index e671d56..476233c 100755 --- a/Dockerfile.llamacpp +++ b/Dockerfile.llamacpp @@ -13,7 +13,7 @@ RUN apt-get update \ && apt-get -y install libcurl4-openssl-dev WORKDIR /app COPY . . -RUN LLAMA_CURL=1 GGML_CUDA=1 CUDA_DOCKER_ARCH=all make -j$(nproc) llama-server +RUN LLAMA_CURL=1 GGML_CUDA=1 CUDA_DOCKER_ARCH=all make -j$(nproc) llamacpp # runtime image FROM --platform=${ARCH} ${BASE_IMAGE_RUNTIME} AS runtime diff --git a/Makefile b/Makefile index f565793..7c923f7 100755 --- a/Makefile +++ b/Makefile @@ -54,13 +54,9 @@ docker-cuda: docker-dep # Build docker container - assume we need to build the base images? docker-cuda-push: docker-cuda - @echo "Building ${DOCKER_TAG_LLAMACPP}" - @${DOCKER} build \ - --tag ${DOCKER_TAG_LLAMACPP} \ - --build-arg ARCH=${ARCH} \ - --build-arg BASE_IMAGE_BUILD=${DOCKER_TAG_BASE_BUILD} \ - --build-arg BASE_IMAGE_RUNTIME=${DOCKER_TAG_BASE_RUNTIME} \ - -f Dockerfile.llamacpp . + @echo push docker images + @${DOCKER} push ${DOCKER_TAG_BASE_BUILD} + @${DOCKER} push ${DOCKER_TAG_BASE_RUNTIME} # Build llama libraries llamacpp: submodule-checkout