Skip to content

Commit 1270b34

Browse files
authored
Fix manifest creation (#459)
1 parent a247ef9 commit 1270b34

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

createAllManifests.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,23 @@ param (
1616
$createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
1717

1818
$latestStableUbuntu = "ubuntu-bionic"
19-
$latestStableWscLtsc = "windowsservercore-latest"
2019
$latestStableWsc1809 = "windowsservercore-1809"
2120
$latestStableWsc1903 = "windowsservercore-1903"
2221
$latestStableNano1809 = "nanoserver-1809"
2322
$latestStableNano1903 = "nanoserver-1903"
2423

2524
$latestPreviewUbuntu = "preview-ubuntu-bionic"
26-
$latestPreviewWscLtsc = "preview-windowsservercore-latest"
2725
$latestPreviewWsc1809 = "preview-windowsservercore-1809"
2826
$latestPreviewWsc1903 = "preview-windowsservercore-1809"
2927

3028
switch ($Channel)
3129
{
3230
'preview' {
33-
&$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1809 -ManifestTag 'preview'
31+
&$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWsc1809 -ManifestTag 'preview'
3432
}
3533

3634
'stable' {
37-
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1809 -ManifestTag 'latest'
35+
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWsc1809 -ManifestTag 'latest'
3836
&$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1809 -ManifestTag 'nanoserver'
3937
}
4038
}

createManifest.ps1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,21 @@ param(
2626
$TagList = ('ubuntu-16.04', 'windowsservercore')
2727
)
2828

29+
$first = $true
2930
$manifestList = @()
3031
foreach($tag in $TagList)
3132
{
32-
$manifestList += "$ContainerRegistry/${Image}:$tag"
33+
$ammend = ""
34+
if (!$first) {
35+
$amend = '--amend'
36+
}
37+
38+
Write-Verbose -Message "running: docker manifest create $ammend $ContainerRegistry/${Image}:$ManifestTag $ContainerRegistry/${Image}:$tag" -Verbose
39+
docker manifest create $amend $ContainerRegistry/${Image}:$ManifestTag "$ContainerRegistry/${Image}:$tag"
40+
$first = $false
3341
}
3442

3543
# Create the manifest
36-
docker manifest create $ContainerRegistry/${Image}:$ManifestTag $manifestList
3744

3845
# Inspect (print) the manifest
3946
docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag

release/lts/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN apt-get update \
5353
# required for SSL
5454
ca-certificates \
5555
gss-ntlmssp \
56-
libicu63 \
56+
libicu67 \
5757
libssl1.1 \
5858
libc6 \
5959
libgcc1 \

release/preview/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN apt-get update \
5353
# required for SSL
5454
ca-certificates \
5555
gss-ntlmssp \
56-
libicu63 \
56+
libicu67 \
5757
libssl1.1 \
5858
libc6 \
5959
libgcc1 \

release/stable/debian11/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN apt-get update \
5353
# required for SSL
5454
ca-certificates \
5555
gss-ntlmssp \
56-
libicu63 \
56+
libicu67 \
5757
libssl1.1 \
5858
libc6 \
5959
libgcc1 \

0 commit comments

Comments
 (0)