Update common Docker engineering infrastructure with latest (dotnet#255)

Author: dotnet-maestro-bot

eng/common/Invoke-CleanupDocker.ps1

@@ -5,7 +5,7 @@ docker ps -a -q | ForEach-Object { docker rm -f $_ }
 
 docker volume prune -f
 
-# Preserve the Windows base images and the common eng infra images (e.g. ImageBuilder)
+# Preserve the tagged Windows base images and the common eng infra images (e.g. ImageBuilder)
 # to avoid the expense of having to repull continuously.
 $engInfraImages = Get-Content ./eng/common/templates/variables/docker-images.yml |
     Where-Object { $_.Trim() -notlike 'variables:' } |
@@ -14,7 +14,8 @@ $engInfraImages = Get-Content ./eng/common/templates/variables/docker-images.yml
 docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}"|
     Where-Object {
         $localImage = $_
-        -Not ($localImage.StartsWith("mcr.microsoft.com/windows")`
+        $localImage.Contains(":<none> ")`
+        -Or -Not ($localImage.StartsWith("mcr.microsoft.com/windows")`
             -Or ($engInfraImages.Where({ $localImage.StartsWith($_) }, 'First').Count -gt 0)) } |
     ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[1] } |
     Select-Object -Unique |

eng/common/templates/steps/cleanup-docker-linux.yml

@@ -17,7 +17,7 @@ steps:
     continueOnError: true
   - script: >
       docker run --rm $(dockerArmRunOptions) --entrypoint /bin/bash $(dockerClientImage) -c
-      'docker rmi -f $(docker images --format "{{.Repository}}:{{.Tag}}" | grep -v -e ^arm32v7/ -e ^arm64v8/ -e ^mcr\\.microsoft\\.com/windows)'
+      'docker rmi -f $(docker images --format "{{.Repository}}:{{.Tag}}" | grep -v -e ^arm32v7/ -e ^arm64v8/ -e ^mcr\\.microsoft\\.com/windows -e :\<none\>$)'
     displayName: Cleanup Remote Docker Server (images)
     condition: always()
     continueOnError: true