llm, extend keep alive, add final mounts to open-terminal, have open-webui do its update 5 minutes after boot once network exists, fix extra / in JAVA_HOME.
This commit is contained in:
1 parent
65aeea9a93
commit
9e75d9b981
1 file changed
+9
-5
@@ -293,7 +293,7 @@
|
|||||||
export OLLAMA_REQUEST_TIMEOUT=3600 # default 300 (unconfirmed, not in the list of --help vars)
|
export OLLAMA_REQUEST_TIMEOUT=3600 # default 300 (unconfirmed, not in the list of --help vars)
|
||||||
|
|
||||||
### Resource Usage ###
|
### Resource Usage ###
|
||||||
export OLLAMA_KEEP_ALIVE=2h # default is 5m. Good frontends keep the model alive as long as it needs to be, this is not a source of timeout.
|
export OLLAMA_KEEP_ALIVE=-1 # default is 5m. Good frontends keep the model alive as long as it needs to be, this is not a source of timeout.
|
||||||
export OLLAMA_MAX_LOADED_MODELS={{ llm_concurrency }} # default is 3 if using CPUs, or 3 * NumGPUs
|
export OLLAMA_MAX_LOADED_MODELS={{ llm_concurrency }} # default is 3 if using CPUs, or 3 * NumGPUs
|
||||||
export OLLAMA_NUM_PARALLEL={{ llm_parallel }} # default is 1 and applies per-model (unconfirmed)
|
export OLLAMA_NUM_PARALLEL={{ llm_parallel }} # default is 1 and applies per-model (unconfirmed)
|
||||||
export OLLAMA_CONTEXT_LENGTH={{ llm_context }} # default is 4096, https://docs.ollama.com/faq#how-can-i-specify-the-context-window-size
|
export OLLAMA_CONTEXT_LENGTH={{ llm_context }} # default is 4096, https://docs.ollama.com/faq#how-can-i-specify-the-context-window-size
|
||||||
@@ -442,8 +442,9 @@
|
|||||||
echo "RUN: Container already deleted."
|
echo "RUN: Container already deleted."
|
||||||
|
|
||||||
# Check for any new updates in background.
|
# Check for any new updates in background.
|
||||||
echo "RUN: Updating..."
|
sleep 300 &&
|
||||||
docker pull $image &
|
echo "RUN: Updating..." &&
|
||||||
|
docker pull $image &
|
||||||
|
|
||||||
# Start the open-webui program.
|
# Start the open-webui program.
|
||||||
set -e
|
set -e
|
||||||
@@ -453,6 +454,7 @@
|
|||||||
-e OLLAMA_BASE_URL=http://0.0.0.0:11434 \
|
-e OLLAMA_BASE_URL=http://0.0.0.0:11434 \
|
||||||
{{ ("-e HF_TOKEN=" ~ hf_token) if hf_token else '' }} \
|
{{ ("-e HF_TOKEN=" ~ hf_token) if hf_token else '' }} \
|
||||||
-e WEBUI_SECRET_KEY={{ open_webui_key }} \
|
-e WEBUI_SECRET_KEY={{ open_webui_key }} \
|
||||||
|
-e ENABLE_QUERIES_CACHE=True \
|
||||||
-v open-webui:/app/backend/data \
|
-v open-webui:/app/backend/data \
|
||||||
$image
|
$image
|
||||||
|
|
||||||
@@ -558,7 +560,7 @@
|
|||||||
export PUB_CACHE={{ user_user.home }}/.pub-cache
|
export PUB_CACHE={{ user_user.home }}/.pub-cache
|
||||||
export PATH="$FLUTTER_HOME/bin:$PATH"
|
export PATH="$FLUTTER_HOME/bin:$PATH"
|
||||||
|
|
||||||
export JAVA_HOME="/{{ user_user.home }}/SDKs/Java"
|
export JAVA_HOME="{{ user_user.home }}/SDKs/Java"
|
||||||
export PATH="$JAVA_HOME/bin:$PATH"
|
export PATH="$JAVA_HOME/bin:$PATH"
|
||||||
create: false
|
create: false
|
||||||
backup: false
|
backup: false
|
||||||
@@ -693,6 +695,8 @@
|
|||||||
- {{ user_user.home }}/SDKs:{{ user_user.home }}/SDKs
|
- {{ user_user.home }}/SDKs:{{ user_user.home }}/SDKs
|
||||||
- {{ jdk_jvm }}:{{ jdk_jvm }}:ro
|
- {{ jdk_jvm }}:{{ jdk_jvm }}:ro
|
||||||
- {{ jdk_etc }}:{{ jdk_etc }}:ro
|
- {{ jdk_etc }}:{{ jdk_etc }}:ro
|
||||||
|
- /etc/ssl/certs/java:/etc/ssl/certs/java:ro
|
||||||
|
- /etc/ca-certificates:/etc/ca-certificates:ro
|
||||||
- {{ jdk_etc17 }}:{{ jdk_etc17 }}:ro
|
- {{ jdk_etc17 }}:{{ jdk_etc17 }}:ro
|
||||||
- {{ jdk_etc21 }}:{{ jdk_etc21 }}:ro
|
- {{ jdk_etc21 }}:{{ jdk_etc21 }}:ro
|
||||||
- {{ jdk_etc25 }}:{{ jdk_etc25 }}:ro
|
- {{ jdk_etc25 }}:{{ jdk_etc25 }}:ro
|
||||||
@@ -759,8 +763,8 @@
|
|||||||
echo "RUN: Container already stopped."
|
echo "RUN: Container already stopped."
|
||||||
|
|
||||||
# Check for any new updates in background.
|
# Check for any new updates in background.
|
||||||
echo "RUN: Updating..."
|
|
||||||
sleep 60 &&
|
sleep 60 &&
|
||||||
|
echo "RUN: Updating..." &&
|
||||||
docker compose -f /usr/local/etc/open-terminal/docker-compose.yml \
|
docker compose -f /usr/local/etc/open-terminal/docker-compose.yml \
|
||||||
build --pull &
|
build --pull &
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user