From 4af9f4edac5945a7d3058b720b8abbd6310baf98 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 10 May 2018 14:36:47 -0700 Subject: [PATCH] fix create docker manifest script to work with more complex tags and with repeated use (#6852) fix create docker manifest script to work with more complex tags and with repeated use - add characters to validation pattern - purge manifest after pushing as there is no other way to delete the manifest. --- docker/createManifest.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/createManifest.ps1 b/docker/createManifest.ps1 index 0bb613f3a6..1372637e44 100644 --- a/docker/createManifest.ps1 +++ b/docker/createManifest.ps1 @@ -8,17 +8,17 @@ param( $ContainerRegistry, [ValidateNotNullOrEmpty()] - [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz-]+$')] + [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz\-0123456789\.]+$')] [string] $ManifestTag = 'latest', [ValidateNotNullOrEmpty()] - [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz-]+$')] + [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz\-0123456789\.]+$')] [string] $Image = 'powershell', [ValidateNotNullOrEmpty()] - [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz-]+$')] + [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz\-0123456789\.]+$')] [string[]] $TagList = ('ubuntu-16.04', 'windowsservercore') ) @@ -36,4 +36,4 @@ docker manifest create $ContainerRegistry/${Image}:$ManifestTag $manifestList docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag # push the manifest -docker manifest push $ContainerRegistry/${Image}:$ManifestTag +docker manifest push --purge $ContainerRegistry/${Image}:$ManifestTag