s/Containerfile/Makefile/ typo fix

Signed-off-by: Liora Milbaum <[email protected]>
containers · Mar 28, 2024 · f31feca · f31feca
1 parent a50c9db
commit f31feca
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -96,7 +96,7 @@ jobs:
           image: ${{ env.MODEL_SERVICE_IMAGE }} 
           tags: latest ${{ github.sha }}
           platforms: linux/amd64, linux/arm64 
-          context: model_servers/llamacpp_python/base
+          context: model_servers/llamacpp_python
           containerfiles: ./model_servers/llamacpp_python/base/Containerfile
 
       - name: Push model-service image

diff --git a/.github/workflows/playground.yaml → .github/workflows/llamacpp_python.yaml b/.github/workflows/playground.yaml → .github/workflows/llamacpp_python.yaml
@@ -1,4 +1,4 @@
-name: playground
+name: llamacpp_python
 
 on:
   pull_request:
@@ -39,7 +39,7 @@ jobs:
           image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: latest
           containerfiles: ./model_servers/llamacpp_python/base/Containerfile
-          context: model_servers/llamacpp_python/base
+          context: model_servers/llamacpp_python/
 
       - name: Set up Python
         uses: actions/[email protected]

diff --git a/model_servers/llamacpp_python/README.md b/model_servers/llamacpp_python/README.md
@@ -7,7 +7,7 @@ podman build -t playground .
 ```
 or
 ```bash
-make -f Containerfile build
+make -f Makefile build
 ```
 
 ### Download Model
@@ -26,7 +26,7 @@ cd ../
 ```
 or
 ```bash
-make -f Containerfile download
+make -f Makefile models/llama-2-7b-chat.Q5_K_S.gguf
 ```
 
 ### Deploy Model Service
@@ -46,7 +46,7 @@ podman run --rm -it -d \
 ```
 or
 ```bash
-make -f Containerfile run
+make -f Makefile run
 ```
 
 #### Multiple Model Service:
@@ -89,5 +89,5 @@ The environment is implemented with devcontainer technology.
 
 Running tests
 ```bash
-make -f Containerfile test
+make -f Makefile test
 ```
diff --git a/model_servers/llamacpp_python/base/Containerfile b/model_servers/llamacpp_python/base/Containerfile
@@ -1,8 +1,6 @@
 FROM registry.access.redhat.com/ubi9/python-311:1-52
 WORKDIR /locallm
 COPY src .
-COPY requirements.txt /locallm/requirements.txt
-RUN pip install --no-cache-dir --verbose -r /locallm/requirements.txt
-COPY run.sh run.sh
+RUN pip install --no-cache-dir --verbose -r ./requirements.txt
 EXPOSE 8001
-ENTRYPOINT [ "sh", "run.sh" ]
+ENTRYPOINT [ "sh", "./run.sh" ]
diff --git a/model_servers/llamacpp_python/base/Makefile b/model_servers/llamacpp_python/base/Makefile
@@ -5,14 +5,14 @@ build:
 models/llama-2-7b-chat.Q5_K_S.gguf:
 	curl -s -S -L -f https://huggingface.co/TheBloke/Llama-2-7B-Chat-GGUF/resolve/main/llama-2-7b-chat.Q5_K_S.gguf -z $@ -o $@.tmp && mv -f $@.tmp $@ 2>/dev/null || rm -f $@.tmp $@
 
-.PHONY: download
-download:
-	pip install -r tests/requirements.txt
+.PHONY: install
+install:
+	pip install -r model_servers/llamacpp_python/base/tests/requirements.txt
 
 .PHONY: run
-run: install models/llama-2-7b-chat.Q5_K_S.gguf
+run: models/llama-2-7b-chat.Q5_K_S.gguf install
 	podman run -it -d -p 8001:8001 -v ./models:/locallm/models:ro,Z -e MODEL_PATH=models/llama-2-7b-chat.Q5_K_S.gguf -e HOST=0.0.0.0 -e PORT=8001 --net=host ghcr.io/redhat-et/playground
 
 .PHONY: test
-test: models/llama-2-7b-chat.Q5_K_S.gguf download
+test: models/llama-2-7b-chat.Q5_K_S.gguf install
 	pytest --log-cli-level NOTSET