Skip to content

Commit 0b8ea0c

Browse files
lbussellCopilot
andcommitted
Fix resolute chiseled expected package lists
Remove openssl-provider-legacy from expected packages (no longer present in resolute images) and add tzdata-legacy to the extra packages for resolute chiseled images. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 80af290 commit 0b8ea0c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,11 @@ private static string GetZLibPackage(OSInfo os)
392392
}
393393

394394
/// <summary>
395-
/// Syft detects gcc-16 and openssl-provider-legacy as separate binary packages
395+
/// Syft detects gcc-16 as a separate binary package
396396
/// on amd64 resolute chiseled images but not on arm64/arm32.
397397
/// </summary>
398398
private static IEnumerable<string> GetResoluteChiseledAmd64Packages(ProductImageData imageData) =>
399-
imageData.Arch == Arch.Amd64 ? ["gcc-16", "openssl-provider-legacy"] : [];
399+
imageData.Arch == Arch.Amd64 ? ["gcc-16"] : [];
400400

401401
private static IEnumerable<string> GetExtraPackages(ProductImageData imageData) => imageData switch
402402
{
@@ -409,7 +409,8 @@ private static IEnumerable<string> GetResoluteChiseledAmd64Packages(ProductImage
409409
{
410410
"icu",
411411
"libicu78",
412-
"tzdata"
412+
"tzdata",
413+
"tzdata-legacy"
413414
},
414415
{ OS: var os } when os == OS.NobleChiseled => new[]
415416
{

0 commit comments

Comments
 (0)