Fix manifest creation (#459)

PowerShell · Jul 16, 2020 · 1270b34 · 1270b34
1 parent a247ef9
commit 1270b34
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
@@ -16,25 +16,23 @@ param (
 $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
 
 $latestStableUbuntu   = "ubuntu-bionic"
-$latestStableWscLtsc  = "windowsservercore-latest"
 $latestStableWsc1809  = "windowsservercore-1809"
 $latestStableWsc1903  = "windowsservercore-1903"
 $latestStableNano1809 = "nanoserver-1809"
 $latestStableNano1903 = "nanoserver-1903"
 
 $latestPreviewUbuntu  = "preview-ubuntu-bionic"
-$latestPreviewWscLtsc = "preview-windowsservercore-latest"
 $latestPreviewWsc1809 = "preview-windowsservercore-1809"
 $latestPreviewWsc1903 = "preview-windowsservercore-1809"
 
 switch ($Channel)
 {
     'preview' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1809 -ManifestTag 'preview'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWsc1809 -ManifestTag 'preview'
     }
 
     'stable' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1809 -ManifestTag 'latest'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWsc1809 -ManifestTag 'latest'
         &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1809 -ManifestTag 'nanoserver'
     }
 }
diff --git a/createManifest.ps1 b/createManifest.ps1
@@ -26,14 +26,21 @@ param(
     $TagList = ('ubuntu-16.04', 'windowsservercore')
 )
 
+$first = $true
 $manifestList = @()
 foreach($tag in $TagList)
 {
-    $manifestList += "$ContainerRegistry/${Image}:$tag"
+    $ammend = ""
+    if (!$first) {
+        $amend = '--amend'
+    }
+
+    Write-Verbose -Message "running: docker manifest create $ammend $ContainerRegistry/${Image}:$ManifestTag $ContainerRegistry/${Image}:$tag" -Verbose
+    docker manifest create $amend $ContainerRegistry/${Image}:$ManifestTag "$ContainerRegistry/${Image}:$tag"
+    $first = $false
 }
 
 # Create the manifest
-docker manifest create $ContainerRegistry/${Image}:$ManifestTag $manifestList
 
 # Inspect (print) the manifest
 docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag

diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \

diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \

diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \