From dd0cf4cc639d9d2e93b6a86b20bf921758a45d4a Mon Sep 17 00:00:00 2001 From: Freddy Kristiansen Date: Fri, 5 Apr 2024 07:06:02 +0200 Subject: [PATCH] issue #3465 (#3466) Fixes #3465 Co-authored-by: freddydk --- ContainerHandling/Flush-ContainerHelperCache.ps1 | 2 +- ReleaseNotes.txt | 3 +++ Version.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ContainerHandling/Flush-ContainerHelperCache.ps1 b/ContainerHandling/Flush-ContainerHelperCache.ps1 index 2301fc39f..8135bc656 100644 --- a/ContainerHandling/Flush-ContainerHelperCache.ps1 +++ b/ContainerHandling/Flush-ContainerHelperCache.ps1 @@ -183,7 +183,7 @@ try { "artifactUrl=https://bcprivate*.net/", "artifactUrl=https://bcpublicpreview*.net/" | ForEach-Object { if ($artifactUrl -like "$($_)*") { - $cacheFolder = Join-Path $artifactsCacheFolder $artifactUrl.SubString($_.Length) + $cacheFolder = Join-Path $artifactsCacheFolder $artifactUrl.Substring($artifactUrl.IndexOf('/',$_.Length)+1) if (-not (Test-Path $cacheFolder)) { Write-Host "$imageName was built on artifacts which was removed from the cache, removing image" if (-not (DockerDo -command rmi -parameters @("--force") -imageName $imageID -ErrorAction SilentlyContinue)) { diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 1ee2bcb0c..9d7982a90 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,6 @@ +6.0.14 +Issue 3465 Regression: Flush-ContainerHelperCache calculates wrong CacheFolder + 6.0.13 Issue 3452 Error when running Run-AlValidation : Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. Issue 3454 DockerDo : Cannot bind argument to parameter 'imageName' because it is an empty string. diff --git a/Version.txt b/Version.txt index 23adf3e26..470629b9d 100644 --- a/Version.txt +++ b/Version.txt @@ -1 +1 @@ -6.0.13-dev +6.0.14-dev