Compare commits

..
Author SHA1 Message Date
hermes 9ac790f8f3 feat: pull del modelo respeta HTTPS_PROXY
Tu red no llega al registry de Ollama (R2/Cloudflare). Si hay proxy
definido en HTTPS_PROXY, se pasa al contenedor en el pull (doc oficial
de Ollama para Docker). Sin proxy, el mensaje de error explica como
definirlo y relanzar.
2026-09-12 20:58:42 +02:00
4 changed files with 32 additions and 116 deletions

No files matched your search

+8 -29
View File
@@ -134,36 +134,15 @@ foreach ($Attempt in 1..3) {
Start-Sleep -Seconds 5
}
if (-not $PullOk) {
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
$Urls = @(
'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf',
'https://huggingface.co/unsloth/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
)
$DlOk = $false
foreach ($Url in $Urls) {
curl.exe -sL --retry 3 --max-time 1800 -o "$Gguf" $Url
if ($LASTEXITCODE -eq 0 -and (Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 1900000000) { $DlOk = $true; break }
Warn "Mirror no accesible, probando el siguiente..."
}
if ($DlOk) {
docker cp "$Gguf" d0a1-hermes-ollama:/root/.ollama/import.gguf
docker exec d0a1-hermes-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
$CreateOk = ($LASTEXITCODE -eq 0)
docker exec d0a1-hermes-ollama rm -f /root/.ollama/import.gguf | Out-Null
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
if ($CreateOk) { $PullOk = $true }
else { Err 'Fallo al importar el modelo desde el GGUF.' }
} else {
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
exit 1
Err 'Fallo la descarga del modelo tras 3 intentos.'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
Write-Host ' O reintenta a mano:'
Write-Host ' docker exec d0a1-hermes-ollama ollama pull llama3.2:3b'
exit 1
}
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
+8 -29
View File
@@ -134,36 +134,15 @@ foreach ($Attempt in 1..3) {
Start-Sleep -Seconds 5
}
if (-not $PullOk) {
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
$Urls = @(
'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf',
'https://huggingface.co/unsloth/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
)
$DlOk = $false
foreach ($Url in $Urls) {
curl.exe -sL --retry 3 --max-time 1800 -o "$Gguf" $Url
if ($LASTEXITCODE -eq 0 -and (Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 1900000000) { $DlOk = $true; break }
Warn "Mirror no accesible, probando el siguiente..."
}
if ($DlOk) {
docker cp "$Gguf" d0a1-openclaw-ollama:/root/.ollama/import.gguf
docker exec d0a1-openclaw-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
$CreateOk = ($LASTEXITCODE -eq 0)
docker exec d0a1-openclaw-ollama rm -f /root/.ollama/import.gguf | Out-Null
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
if ($CreateOk) { $PullOk = $true }
else { Err 'Fallo al importar el modelo desde el GGUF.' }
} else {
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
exit 1
Err 'Fallo la descarga del modelo tras 3 intentos.'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
Write-Host ' O reintenta a mano:'
Write-Host ' docker exec d0a1-openclaw-ollama ollama pull llama3.2:3b'
exit 1
}
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
+8 -29
View File
@@ -151,36 +151,15 @@ foreach ($Attempt in 1..3) {
Start-Sleep -Seconds 5
}
if (-not $PullOk) {
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
$Urls = @(
'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf',
'https://huggingface.co/unsloth/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
)
$DlOk = $false
foreach ($Url in $Urls) {
curl.exe -sL --retry 3 --max-time 1800 -o "$Gguf" $Url
if ($LASTEXITCODE -eq 0 -and (Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 1900000000) { $DlOk = $true; break }
Warn "Mirror no accesible, probando el siguiente..."
}
if ($DlOk) {
docker cp "$Gguf" d0a1-ollama:/root/.ollama/import.gguf
docker exec d0a1-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
$CreateOk = ($LASTEXITCODE -eq 0)
docker exec d0a1-ollama rm -f /root/.ollama/import.gguf | Out-Null
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
if ($CreateOk) { $PullOk = $true }
else { Err 'Fallo al importar el modelo desde el GGUF.' }
} else {
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
exit 1
Err 'Fallo la descarga del modelo tras 3 intentos.'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
Write-Host ' O reintenta a mano:'
Write-Host ' docker exec d0a1-ollama ollama pull llama3.2:3b'
exit 1
}
# --- Done -------------------------------------------------------------------
+8 -29
View File
@@ -187,36 +187,15 @@ foreach ($Attempt in 1..3) {
Start-Sleep -Seconds 5
}
if (-not $PullOk) {
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
$Urls = @(
'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf',
'https://huggingface.co/unsloth/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
)
$DlOk = $false
foreach ($Url in $Urls) {
curl.exe -sL --retry 3 --max-time 1800 -o "$Gguf" $Url
if ($LASTEXITCODE -eq 0 -and (Test-Path $Gguf) -and (Get-Item $Gguf).Length -gt 1900000000) { $DlOk = $true; break }
Warn "Mirror no accesible, probando el siguiente..."
}
if ($DlOk) {
docker cp "$Gguf" d0a1-wp-ollama:/root/.ollama/import.gguf
docker exec d0a1-wp-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
$CreateOk = ($LASTEXITCODE -eq 0)
docker exec d0a1-wp-ollama rm -f /root/.ollama/import.gguf | Out-Null
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
if ($CreateOk) { $PullOk = $true }
else { Err 'Fallo al importar el modelo desde el GGUF.' }
} else {
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
exit 1
Err 'Fallo la descarga del modelo tras 3 intentos.'
if (-not $env:HTTPS_PROXY) {
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
Write-Host ' .\deploy.ps1 vps'
}
Write-Host ' O reintenta a mano:'
Write-Host ' docker exec d0a1-wp-ollama ollama pull llama3.2:3b'
exit 1
}
# --- Done -------------------------------------------------------------------