0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PowerShell: fix "Nuke-Everything" failing to remove images

Browse source 
I noticed this error in CI:

```
20:37:25 INFO: Non-base image count on control daemon to delete is 9
20:37:25 "docker rmi" requires at least 1 argument.
20:37:25 See 'docker rmi --help'.
20:37:25
20:37:25 Usage:  docker rmi [OPTIONS] IMAGE [IMAGE...]
20:37:25
20:37:25 Remove one or more images
```

Which indicated that the PowerShell script managed to find images to delete, but
not actually passing the images to `docker rmi`.

The reason for this failing was that the script attempted to convert the
collection/array to a string, which produces;

```powershell
Write-Output $(docker images --format "{{.Repository}}:{{.ID}}" | `
>>         select-string -NotMatch "windowsservercore" | `
>>         select-string -NotMatch "nanoserver" | `
>>         select-string -NotMatch "docker" `
>>         ).ToString()
System.Object[]
```

Which, when trying to split by the chosen separator (`:`), will return the same;

```powershell
Write-Output "System.Object[]".Split(":")[0]
```

This patch:

- Adds an intermediate variable (`$allImages`) to make the code better readable
- Switches the separator to `#`, to prevent breaking on images pulled from a
  repository with a port in its name (`myregistry:5000/my/image`)
- Switches to use a comma-separated list for `-NotMatch` (for readability)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5580b79813)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2018-12-22 22:49:33 +01:00
parent 431dc221e3
commit 74fe2c044f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hack/ci/windows.ps1
View file

@ -136,18 +136,14 @@ Function Nuke-Everything {
if ($(docker ps -aq | Measure-Object -line).Lines -gt 0) { if ($(docker ps -aq | Measure-Object -line).Lines -gt 0) {
docker rm -f $(docker ps -aq) docker rm -f $(docker ps -aq)
} }
$imageCount=($(docker images --format "{{.Repository}}:{{.ID}}" | `
select-string -NotMatch "windowsservercore" | ` $allImages = $(docker images --format "{{.Repository}}#{{.ID}}")
select-string -NotMatch "nanoserver" | ` $toRemove = ($allImages | Select-String -NotMatch "windowsservercore","nanoserver","docker")
select-string -NotMatch "docker" | ` $imageCount = ($toRemove | Measure-Object -line).Lines
Measure-Object -line).Lines)
if ($imageCount -gt 0) { if ($imageCount -gt 0) {
Write-Host -Foregroundcolor green "INFO: Non-base image count on control daemon to delete is $imageCount" Write-Host -Foregroundcolor green "INFO: Non-base image count on control daemon to delete is $imageCount"
docker rmi -f ` docker rmi -f ($toRemove | Foreach-Object { $_.ToString().Split("#")[1] })
$(docker images --format "{{.Repository}}:{{.ID}}" | `
select-string -NotMatch "windowsservercore" | `
select-string -NotMatch "nanoserver" | `
select-string -NotMatch "docker").ToString().Split(":")[1]
} }
} else { } else {
Write-Host -ForegroundColor Magenta "WARN: Skipping cleanup of images and containers" Write-Host -ForegroundColor Magenta "WARN: Skipping cleanup of images and containers"