Skip to content

Commit ee87d9e

Browse files
committed
feat: switch to built-in environment variables
1 parent 8714c35 commit ee87d9e

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ services:
44
image: llama-cpp-docker
55
environment:
66
- GGML_CUDA_NO_PINNED=1
7-
- LLAMA_CTX_SIZE=2048
8-
- LLAMA_MODEL=/models/Meta-Llama-3.1-8B-Instruct-Q5_K_M.gguf
9-
- LLAMA_N_GPU_LAYERS=99
7+
- LLAMA_ARG_CTX_SIZE=2048
8+
- LLAMA_ARG_MODEL=/models/Meta-Llama-3.1-8B-Instruct-Q5_K_M.gguf
9+
- LLAMA_ARG_N_GPU_LAYERS=99
1010
volumes:
1111
- ./models:/models
1212
ports:

docker-entrypoint.sh

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,13 @@ parse_args_download_model() {
5858
}
5959

6060
set_default_env_vars() {
61-
if [ -z ${LLAMA_HOST+x} ]; then
62-
export LLAMA_HOST="0.0.0.0"
61+
if [ -z ${LLAMA_ARG_HOST+x} ]; then
62+
export LLAMA_ARG_HOST="0.0.0.0"
6363
fi
64-
if [ -z ${LLAMA_MODEL+x} ]; then
65-
export LLAMA_MODEL="/models/Meta-Llama-3.1-8B-Instruct-Q5_K_M.gguf"
66-
fi
67-
}
68-
69-
convert_llama_env_vars() {
70-
LLAMA_ARGS=$(env | grep LLAMA_ | awk '{
71-
# for each environment variable
72-
for (n = 1; n <= NF; n++) {
73-
# replace LLAMA_ prefix with --
74-
sub("^LLAMA_", "--", $n)
75-
# find first = and split into argument name and value
76-
eq = index($n, "=")
77-
s1 = tolower(substr($n, 1, eq - 1))
78-
s2 = substr($n, eq + 1)
79-
# replace _ with - in argument name
80-
gsub("_", "-", s1)
81-
# print argument name and value
82-
print s1 " " s2
83-
}
84-
}')
8564
}
8665

8766
parse_args_download_model "$@"
8867
set_default_env_vars
89-
convert_llama_env_vars
9068

9169
set -x
92-
llama-server $LLAMA_ARGS
70+
llama-server

0 commit comments

Comments
 (0)