From 5772166c442a7b1691436a82648f25f4cb8b3cfa Mon Sep 17 00:00:00 2001 From: "Bastian (BaM)" Date: Sat, 13 Sep 2025 20:08:48 +0200 Subject: [PATCH] Refactor environment variable definitions in compose.yaml for consistency and clarity; clean up commented code in auto-boot-ollama-host.sh --- compose.yaml | 13 ++++++------- scripts/auto-boot-ollama-host.sh | 15 +++++---------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/compose.yaml b/compose.yaml index cb491f4..5b00be1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,14 +4,13 @@ services: container_name: auto-boot-ollama-host network_mode: host environment: - # customize as needed - CONTAINER_NAME: "paperless-ai" - OLLAMA_HOST: "192.168.222.12" - OLLAMA_PORT: "11434" - SINCE: "0s" + CONTAINER_NAME: "${CONTAINER_NAME:-paperless-ai}" + OLLAMA_HOST: "${OLLAMA_HOST:-192.168.222.12}" + OLLAMA_PORT: "${OLLAMA_PORT:-11434}" + SINCE: "${SINCE:-0s}" WOL_MAC: "${WOL_MAC}" - #WOL_BCAST: "192.168.222.255" # optional (defaults unten) - #WOL_PORT: "9" # optional + WOL_BCAST: "${WOL_BCAST:-192.168.222.255}" # optional + WOL_PORT: "${WOL_PORT:-9}" # optional restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock:ro \ No newline at end of file diff --git a/scripts/auto-boot-ollama-host.sh b/scripts/auto-boot-ollama-host.sh index d01066e..631e2ae 100644 --- a/scripts/auto-boot-ollama-host.sh +++ b/scripts/auto-boot-ollama-host.sh @@ -43,15 +43,10 @@ while IFS= read -r line; do log "Sending WOL to $WOL_MAC via ${WOL_BCAST}:${WOL_PORT}" send_wol fi - # --- remediation examples (optional) --- - # if [[ -n "$WOL_MAC" ]]; then - # log "Sending WOL to ${WOL_MAC}" - # $WOL_CMD "$WOL_MAC" || true - # fi - # until $NC_CMD -z "$OLLAMA_HOST" "$OLLAMA_PORT"; do - # log "Waiting for Ollama to be reachable..." - # sleep 2 - # done - # log "Ollama reachable again." + #until $NC_CMD -z "$OLLAMA_HOST" "$OLLAMA_PORT"; do + # log "Waiting for Ollama to be reachable..." + # sleep 2 + #done + #log "Ollama reachable again." fi done