Fix Debian build (#237)

* Fix debian build

* remove extra logging

Author: TravisEz13

build.ps1

@@ -237,7 +237,8 @@ End {
                 -Version $windowsVersion `
                 -ImageName $ImageName `
                 -LinuxVersion $linuxVersion `
-                -BaseRepositry $Repository
+                -BaseRepositry $Repository `
+                -Strict:$CheckForDuplicateTags.IsPresent
 
             $nameForMessage = Split-Path -Leaf -Path $dockerFileName
             $message = "Channel: $nameForMessage does not exist.  Not every image exists in every channel.  Skipping."
@@ -276,7 +277,9 @@ End {
                             -LinuxVersion $linuxVersion `
                             -TagData $allMeta.TagData `
                             -BaseImage $actualTagData.ActualTags[0] `
-                            -BaseRepositry $Repository
+                            -BaseRepositry $Repository `
+                            -Strict:$CheckForDuplicateTags.IsPresent
+
 
                         $toBuild += $subImageAllMeta
                     }

release/preview/debian9/getLatestTag.ps1

@@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9'
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter

release/stable/debian9/getLatestTag.ps1

@@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9'
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter

tools/buildHelper/buildHelper.psm1

@@ -370,7 +370,10 @@ function Get-DockerImageMetaDataWrapper
         $BaseImage,
 
         [string]
-        $BaseRepositry
+        $BaseRepositry,
+
+        [switch]
+        $Strict
     )
 
     $imagePath = Join-Path -Path $ChannelPath -ChildPath $dockerFileName
@@ -405,6 +408,12 @@ function Get-DockerImageMetaDataWrapper
     {
         # Get the tag data for the image
         $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
+        Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
+        if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
+        {
+            throw "Did not get tag data from script for $scriptPath!"
+        }
+
         if($TagFilter)
         {
             $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
@@ -597,7 +606,6 @@ function Get-TestParams
         }
     }
 
-    Write-Verbose "ac: $actualChannel" -Verbose
     $testArgs = @{
         tags = $actualTagData.ActualTags
         BuildArgs = $buildArgs

tools/getDockerTags/getDockerTags.psm1

@@ -114,30 +114,33 @@ function Get-DockerTags
                     Sort-Object -Descending |
                         Select-Object -First 1
 
-        # Return the short form of the tag
-        $results += [UpstreamDockerTagData] @{
-            Type = 'Short'
-            Tag = $shortTag
-            FromTag = $fullTag
-        }
-
-        if($AlternativeShortTag)
+        if($fullTag)
         {
             # Return the short form of the tag
             $results += [UpstreamDockerTagData] @{
                 Type = 'Short'
-                Tag = $AlternativeShortTag
+                Tag = $shortTag
                 FromTag = $fullTag
             }
-        }
 
-        if(!$OnlyShortTags.IsPresent)
-        {
-            # Return the full form of the tag
-            $results += [UpstreamDockerTagData] @{
-                Type = 'Full'
-                Tag = $fullTag
-                FromTag = $fullTag
+            if($AlternativeShortTag)
+            {
+                # Return the short form of the tag
+                $results += [UpstreamDockerTagData] @{
+                    Type = 'Short'
+                    Tag = $AlternativeShortTag
+                    FromTag = $fullTag
+                }
+            }
+
+            if(!$OnlyShortTags.IsPresent)
+            {
+                # Return the full form of the tag
+                $results += [UpstreamDockerTagData] @{
+                    Type = 'Full'
+                    Tag = $fullTag
+                    FromTag = $fullTag
+                }
             }
         }
     }