Fixed DockerBuild.ps1.

Author: gfraiteur

Build.ps1

@@ -15,7 +15,7 @@ $EngPath = 'eng'
 $ProductName = 'PostSharpEngineering'
 ####
 
-if ( $StartVsmon  )
+if ($StartVsmon)
 {
     $vsmonport = 4024
     Write-Host "Starting Visual Studio Remote Debugger, listening at port $vsmonport." -ForegroundColor Cyan
@@ -25,22 +25,23 @@ if ( $StartVsmon  )
 }
 
 # Change the prompt and window title in Docker.
-if ( $env:RUNNING_IN_DOCKER  )
+if ($env:RUNNING_IN_DOCKER)
 {
-    function global:prompt {
+    function global:prompt
+    {
         $host.UI.RawUI.WindowTitle = "[docker] " + (Get-Location).Path
-        "[docker] $(Get-Location)> "
+        "[docker] $( Get-Location )> "
     }
 }
 
 
-if ( -not $Interactive -or $BuildArgs )
+if (-not $Interactive -or $BuildArgs)
 {
     # Change the working directory so we can use a global.json that is specific to eng.
     $previousLocation = Get-Location
-    
+
     Set-Location $PSScriptRoot\$EngPath\src
-    
+
     try
     {
 

DockerBuild.ps1

@@ -254,6 +254,12 @@ Write-Host "Volume mappings: " @VolumeMappings -ForegroundColor Gray
 Write-Host "Mount points: " $mountPointsAsString -ForegroundColor Gray
 Write-Host "Git directories: " $gitDirectoriesAsString -ForegroundColor Gray
 
+# Kill all containers
+docker ps -q --filter "ancestor=$ImageName" | ForEach-Object {
+    Write-Host "Killing container $_"
+    docker kill $_ 
+}
+
 # Building the image.
 if (-not $NoBuildImage)
 {
@@ -287,23 +293,23 @@ if (-not $BuildImage)
     if ($Interactive)
     {
         $pwshArgs = "-NoExit"
-        $BuildArgs = @("-Interactive") + $BuildArgs
-        $dockerArgs = @("-it")
+$BuildArgs = @("-Interactive") + $BuildArgs
+$dockerArgs = @("-it")
     }
     else
     {
         $pwshArgs = "-NonInteractive"
-        $dockerArgs = @()
+$dockerArgs = @()
     }
 
     $buildArgsString = $BuildArgs -join " "
-    $VolumeMappingsAsString = $VolumeMappings -join " "
-    $dockerArgsAsString = $dockerArgs -join " "
+$VolumeMappingsAsString = $VolumeMappings -join " "
+$dockerArgsAsString = $dockerArgs -join " "
 
 
-    Write-Host "Executing: ``docker run --rm --memory=12g $VolumeMappingsAsString -w $SourceDirName $dockerArgsAsString $ImageName pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE`"``." -ForegroundColor Cyan
+    Write-Host "Executing: ``docker run --rm --memory= 12g $VolumeMappingsAsString -w $SourceDirName $dockerArgsAsString $ImageName pwsh $pwshArgs -Command `"& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE`"``." -ForegroundColor Cyan
 
-    docker run --rm --memory=12g @VolumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE;"
+    docker run --rm --memory=12g @VolumeMappings -w $SourceDirName @dockerArgs $ImageName pwsh $pwshArgs -Command "& .\Build.ps1 $buildArgsString`; exit `$LASTEXITCODE; "
     if ($LASTEXITCODE -ne 0)
     {
         Write-Host "Docker run (build) failed with exit code $LASTEXITCODE" -ForegroundColor Red

src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1

@@ -13,7 +13,6 @@ param(
     [string]$BuildAgentPath = 'C:\BuildAgent',
     [switch]$LoadEnvFromKeyVault, # Forces loading environment variables form the key vault.
     [switch]$StartVsmon, # Enable the remote debugger.
-    [switch]$KillAll, # Kill all containers before building the image.
     [Parameter(ValueFromRemainingArguments)]
     [string[]]$BuildArgs   # Arguments passed to `Build.ps1` within the container.
 )
@@ -256,9 +255,9 @@ Write-Host "Mount points: " $mountPointsAsString -ForegroundColor Gray
 Write-Host "Git directories: " $gitDirectoriesAsString -ForegroundColor Gray
 
 # Kill all containers
-docker ps -q | ForEach-Object {
-Write-Host "Killing container 
-    docker rm -f $_ 
+docker ps -q --filter "ancestor=$ImageName" | ForEach-Object {
+    Write-Host "Killing container $_"
+    docker kill $_ 
 }
 
 # Building the image.