Skip to content

Commit 8dd68df

Browse files
Merge pull request #378 from microsoft/PSL-BUG-17679
fix: Improve Docker availability check using exit code and error match
2 parents 2e4d08f + 9c75c72 commit 8dd68df

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Deployment/resourcedeployment.ps1

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,17 +398,20 @@ class DeploymentResult {
398398

399399
function Check-Docker {
400400
try {
401-
# Try to get Docker info to check if Docker daemon is running
402-
$dockerInfo = docker info 2>&1
403-
if ($dockerInfo -match "ERROR: error during connect") {
401+
# Try to get Docker info to check if Docker daemon is running
402+
$dockerInfo = docker info 2>&1
403+
if ($LASTEXITCODE -ne 0 -or $dockerInfo -match "error during connect") {
404404
return $false
405-
} else {
405+
}
406+
else {
406407
return $true
407408
}
408-
} catch {
409+
}
410+
catch {
409411
Write-Host "An error occurred while checking Docker status." -ForegroundColor Red
410412
Write-Host $_.Exception.Message -ForegroundColor Red
411-
return $false }
413+
return $false
414+
}
412415
}
413416

414417
# Check if Docker is running before proceeding

0 commit comments

Comments
 (0)