Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d59b3fe09 | ||
|
|
5030770bc2 | ||
|
|
c68fe80484 | ||
|
|
fb3c3fdb67 |
No files matched your search
+4
-3
@@ -117,7 +117,7 @@ $running = docker ps --format '{{.Names}}' | Select-String -Quiet 'd0a1-hermes-o
|
|||||||
if (-not $running) {
|
if (-not $running) {
|
||||||
$GpuArgs = @()
|
$GpuArgs = @()
|
||||||
if ($HasGpu) { $GpuArgs = @('--gpus', 'all') }
|
if ($HasGpu) { $GpuArgs = @('--gpus', 'all') }
|
||||||
docker run -d --name d0a1-hermes-ollama --memory 6g @GpuArgs `
|
docker run -d --name d0a1-hermes-ollama --memory 6g --cpus 6.0 @GpuArgs `
|
||||||
-p "${OllamaPort}:11434" `
|
-p "${OllamaPort}:11434" `
|
||||||
-v d0a1_hermes_ollama:/root/.ollama `
|
-v d0a1_hermes_ollama:/root/.ollama `
|
||||||
-e OLLAMA_HOST=0.0.0.0 `
|
-e OLLAMA_HOST=0.0.0.0 `
|
||||||
@@ -147,6 +147,7 @@ if ($env:HTTPS_PROXY) { $ProxyEnv = @('-e', "HTTPS_PROXY=$env:HTTPS_PROXY", '-e'
|
|||||||
$ModelList = docker exec d0a1-hermes-ollama ollama list 2>$null
|
$ModelList = docker exec d0a1-hermes-ollama ollama list 2>$null
|
||||||
if ("$ModelList" -match 'qwen3:4b') {
|
if ("$ModelList" -match 'qwen3:4b') {
|
||||||
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
||||||
|
cmd /c docker exec d0a1-hermes-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf' '>' NUL '2>&1'
|
||||||
} else {
|
} else {
|
||||||
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
||||||
|
|
||||||
@@ -165,7 +166,7 @@ foreach ($Url in $HfUrls) {
|
|||||||
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
||||||
Info 'Importando modelo en Ollama...'
|
Info 'Importando modelo en Ollama...'
|
||||||
docker cp "$Gguf" d0a1-hermes-ollama:/root/.ollama/import.gguf
|
docker cp "$Gguf" d0a1-hermes-ollama:/root/.ollama/import.gguf
|
||||||
docker exec d0a1-hermes-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-hermes-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
$CreateOk = ($LASTEXITCODE -eq 0)
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
docker exec d0a1-hermes-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
docker exec d0a1-hermes-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
@@ -178,7 +179,7 @@ if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
|||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
$PullOk = $true
|
$PullOk = $true
|
||||||
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
||||||
docker exec d0a1-hermes-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-hermes-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
|
|||||||
+4
-3
@@ -117,7 +117,7 @@ $running = docker ps --format '{{.Names}}' | Select-String -Quiet 'd0a1-openclaw
|
|||||||
if (-not $running) {
|
if (-not $running) {
|
||||||
$GpuArgs = @()
|
$GpuArgs = @()
|
||||||
if ($HasGpu) { $GpuArgs = @('--gpus', 'all') }
|
if ($HasGpu) { $GpuArgs = @('--gpus', 'all') }
|
||||||
docker run -d --name d0a1-openclaw-ollama --memory 6g @GpuArgs `
|
docker run -d --name d0a1-openclaw-ollama --memory 6g --cpus 6.0 @GpuArgs `
|
||||||
-p "${OllamaPort}:11434" `
|
-p "${OllamaPort}:11434" `
|
||||||
-v d0a1_openclaw_ollama:/root/.ollama `
|
-v d0a1_openclaw_ollama:/root/.ollama `
|
||||||
-e OLLAMA_HOST=0.0.0.0 `
|
-e OLLAMA_HOST=0.0.0.0 `
|
||||||
@@ -147,6 +147,7 @@ if ($env:HTTPS_PROXY) { $ProxyEnv = @('-e', "HTTPS_PROXY=$env:HTTPS_PROXY", '-e'
|
|||||||
$ModelList = docker exec d0a1-openclaw-ollama ollama list 2>$null
|
$ModelList = docker exec d0a1-openclaw-ollama ollama list 2>$null
|
||||||
if ("$ModelList" -match 'qwen3:4b') {
|
if ("$ModelList" -match 'qwen3:4b') {
|
||||||
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
||||||
|
cmd /c docker exec d0a1-openclaw-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf' '>' NUL '2>&1'
|
||||||
} else {
|
} else {
|
||||||
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
||||||
|
|
||||||
@@ -165,7 +166,7 @@ foreach ($Url in $HfUrls) {
|
|||||||
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
||||||
Info 'Importando modelo en Ollama...'
|
Info 'Importando modelo en Ollama...'
|
||||||
docker cp "$Gguf" d0a1-openclaw-ollama:/root/.ollama/import.gguf
|
docker cp "$Gguf" d0a1-openclaw-ollama:/root/.ollama/import.gguf
|
||||||
docker exec d0a1-openclaw-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-openclaw-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
$CreateOk = ($LASTEXITCODE -eq 0)
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
docker exec d0a1-openclaw-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
docker exec d0a1-openclaw-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
@@ -178,7 +179,7 @@ if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
|||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
$PullOk = $true
|
$PullOk = $true
|
||||||
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
||||||
docker exec d0a1-openclaw-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-openclaw-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ if ($env:HTTPS_PROXY) { $ProxyEnv = @('-e', "HTTPS_PROXY=$env:HTTPS_PROXY", '-e'
|
|||||||
$ModelList = docker exec d0a1-ollama ollama list 2>$null
|
$ModelList = docker exec d0a1-ollama ollama list 2>$null
|
||||||
if ("$ModelList" -match 'qwen3:4b') {
|
if ("$ModelList" -match 'qwen3:4b') {
|
||||||
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
||||||
|
cmd /c docker exec d0a1-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf' '>' NUL '2>&1'
|
||||||
} else {
|
} else {
|
||||||
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
||||||
|
|
||||||
@@ -186,7 +187,7 @@ foreach ($Url in $HfUrls) {
|
|||||||
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
||||||
Info 'Importando modelo en Ollama...'
|
Info 'Importando modelo en Ollama...'
|
||||||
docker cp "$Gguf" d0a1-ollama:/root/.ollama/import.gguf
|
docker cp "$Gguf" d0a1-ollama:/root/.ollama/import.gguf
|
||||||
docker exec d0a1-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
$CreateOk = ($LASTEXITCODE -eq 0)
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
docker exec d0a1-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
docker exec d0a1-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
@@ -199,7 +200,7 @@ if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
|||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
$PullOk = $true
|
$PullOk = $true
|
||||||
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
||||||
docker exec d0a1-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ services:
|
|||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 6G
|
memory: 6G
|
||||||
|
cpus: "6.0"
|
||||||
|
|
||||||
openwebui:
|
openwebui:
|
||||||
container_name: d0a1-openwebui
|
container_name: d0a1-openwebui
|
||||||
@@ -48,7 +49,7 @@ services:
|
|||||||
ENABLE_WEB_SEARCH: "false"
|
ENABLE_WEB_SEARCH: "false"
|
||||||
ENABLE_DIRECT_CONNECTIONS: "false"
|
ENABLE_DIRECT_CONNECTIONS: "false"
|
||||||
CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS: "1"
|
CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS: "1"
|
||||||
DEFAULT_MODEL_PARAMS: '{"function_calling": "legacy"}'
|
DEFAULT_MODEL_PARAMS: '{"function_calling": "legacy", "think": false}'
|
||||||
depends_on:
|
depends_on:
|
||||||
ollama:
|
ollama:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
@@ -205,6 +205,7 @@ if ($env:HTTPS_PROXY) { $ProxyEnv = @('-e', "HTTPS_PROXY=$env:HTTPS_PROXY", '-e'
|
|||||||
$ModelList = docker exec d0a1-wp-ollama ollama list 2>$null
|
$ModelList = docker exec d0a1-wp-ollama ollama list 2>$null
|
||||||
if ("$ModelList" -match 'qwen3:4b') {
|
if ("$ModelList" -match 'qwen3:4b') {
|
||||||
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
Info 'Modelo qwen3:4b ya descargado (volumen intacto). Omitiendo descarga.'
|
||||||
|
cmd /c docker exec d0a1-wp-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf' '>' NUL '2>&1'
|
||||||
} else {
|
} else {
|
||||||
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
# --- Modelo: HF primero (CDN propio, rapido) y registry de Ollama como ultimo recurso ---
|
||||||
|
|
||||||
@@ -223,7 +224,7 @@ foreach ($Url in $HfUrls) {
|
|||||||
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
||||||
Info 'Importando modelo en Ollama...'
|
Info 'Importando modelo en Ollama...'
|
||||||
docker cp "$Gguf" d0a1-wp-ollama:/root/.ollama/import.gguf
|
docker cp "$Gguf" d0a1-wp-ollama:/root/.ollama/import.gguf
|
||||||
docker exec d0a1-wp-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-wp-ollama sh -c 'printf "FROM /root/.ollama/import.gguf\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
$CreateOk = ($LASTEXITCODE -eq 0)
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
docker exec d0a1-wp-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
docker exec d0a1-wp-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
@@ -236,7 +237,7 @@ if ((Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 2400000000) {
|
|||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
$PullOk = $true
|
$PullOk = $true
|
||||||
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
# Contexto ampliado (el default 4096 da 400 en Open WebUI con prompts largos)
|
||||||
docker exec d0a1-wp-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
docker exec d0a1-wp-ollama sh -c 'printf "FROM qwen3:4b\\nPARAMETER num_ctx 16384\\nSYSTEM /no_think\\n" > /tmp/mf && ollama create qwen3:4b -f /tmp/mf'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ services:
|
|||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
memory: 6G
|
memory: 6G
|
||||||
|
cpus: "6.0"
|
||||||
|
|
||||||
openwebui:
|
openwebui:
|
||||||
container_name: d0a1-wp-openwebui
|
container_name: d0a1-wp-openwebui
|
||||||
@@ -78,7 +79,7 @@ services:
|
|||||||
WEBUI_AUTH: "false"
|
WEBUI_AUTH: "false"
|
||||||
DEFAULT_LOCALE: "es"
|
DEFAULT_LOCALE: "es"
|
||||||
CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS: "1"
|
CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS: "1"
|
||||||
DEFAULT_MODEL_PARAMS: '{"function_calling": "legacy"}'
|
DEFAULT_MODEL_PARAMS: '{"function_calling": "legacy", "think": false}'
|
||||||
depends_on:
|
depends_on:
|
||||||
ollama:
|
ollama:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
Reference in new issue
Block a user