Merge in 'release/8.0.1xx' changes

Author: dotnet-bot

src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs

@@ -94,7 +94,7 @@ public static async Task<int> ContainerizeAsync(
         logger.LogInformation(Strings.ContainerBuilder_StartBuildingImage, imageName, string.Join(",", imageName), sourceImageReference);
         cancellationToken.ThrowIfCancellationRequested();
 
-        Layer newLayer = Layer.FromDirectory(publishDirectory.FullName, workingDir, imageBuilder.IsWindows);
+        Layer newLayer = Layer.FromDirectory(publishDirectory.FullName, workingDir, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
         imageBuilder.SetWorkingDirectory(workingDir);
 

src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs

@@ -26,6 +26,11 @@ internal sealed class ImageBuilder
 
     public ImageConfig BaseImageConfig => _baseImageConfig;
 
+    /// <summary>
+    /// MediaType of the output manifest.
+    /// </summary>
+    public string ManifestMediaType => _manifest.MediaType; // output the same media type as the base image manifest.
+
     internal ImageBuilder(ManifestV2 manifest, ImageConfig baseImageConfig, ILogger logger)
     {
         _manifest = manifest;

src/Containers/Microsoft.NET.Build.Containers/Layer.cs

@@ -6,6 +6,7 @@
 using System.IO.Compression;
 using System.Security.Cryptography;
 using System.IO.Enumeration;
+using Microsoft.NET.Build.Containers.Resources;
 
 namespace Microsoft.NET.Build.Containers;
 
@@ -49,7 +50,7 @@ public static Layer FromDescriptor(Descriptor descriptor)
         return new(ContentStore.PathForDescriptor(descriptor), descriptor);
     }
 
-    public static Layer FromDirectory(string directory, string containerPath, bool isWindowsLayer)
+    public static Layer FromDirectory(string directory, string containerPath, bool isWindowsLayer, string manifestMediaType)
     {
         long fileSize;
         Span<byte> hash = stackalloc byte[SHA256.HashSizeInBytes];
@@ -186,9 +187,17 @@ static UnixFileMode DetermineFileMode(FileSystemInfo file)
         string contentHash = Convert.ToHexString(hash).ToLowerInvariant();
         string uncompressedContentHash = Convert.ToHexString(uncompressedHash).ToLowerInvariant();
 
+        string layerMediaType = manifestMediaType switch
+        {
+            // TODO: configurable? gzip always?
+            SchemaTypes.DockerManifestV2 => SchemaTypes.DockerLayerGzip,
+            SchemaTypes.OciManifestV1 => SchemaTypes.OciLayerGzipV1,
+            _ => throw new ArgumentException(Resource.FormatString(nameof(Strings.UnrecognizedMediaType), manifestMediaType))
+        };
+
         Descriptor descriptor = new()
         {
-            MediaType = "application/vnd.docker.image.rootfs.diff.tar.gzip", // TODO: configurable? gzip always?
+            MediaType = layerMediaType,
             Size = fileSize,
             Digest = $"sha256:{contentHash}",
             UncompressedDigest = $"sha256:{uncompressedContentHash}",

src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs

@@ -42,7 +42,7 @@ public async Task PutAsync(string repositoryName, string reference, ManifestV2 m
     {
         string jsonString = JsonSerializer.SerializeToNode(manifest)?.ToJsonString() ?? "";
         HttpContent manifestUploadContent = new StringContent(jsonString);
-        manifestUploadContent.Headers.ContentType = new MediaTypeHeaderValue(SchemaTypes.DockerManifestV2);
+        manifestUploadContent.Headers.ContentType = new MediaTypeHeaderValue(manifest.MediaType);
 
         HttpResponseMessage putResponse = await _client.PutAsync(new Uri(_baseUri, $"/v2/{repositoryName}/manifests/{reference}"), manifestUploadContent, cancellationToken).ConfigureAwait(false);
 

src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs

@@ -10,4 +10,6 @@ internal class SchemaTypes
     internal const string DockerManifestListV2 = "application/vnd.docker.distribution.manifest.list.v2+json";
     internal const string DockerManifestV2 = "application/vnd.docker.distribution.manifest.v2+json";
     internal const string OciManifestV1 = "application/vnd.oci.image.manifest.v1+json"; // https://containers.gitbook.io/build-containers-the-hard-way/#registry-format-oci-image-manifest
+    internal const string DockerLayerGzip = "application/vnd.docker.image.rootfs.diff.tar.gzip";
+    internal const string OciLayerGzipV1 = "application/vnd.oci.image.layer.v1.tar+gzip";
 }

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs

@@ -100,7 +100,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         SafeLog(Strings.ContainerBuilder_StartBuildingImage, Repository, String.Join(",", ImageTags), sourceImageReference);
 
-        Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows);
+        Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
         imageBuilder.SetWorkingDirectory(WorkingDirectory);
 

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -57,7 +57,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull()
 
         Assert.NotNull(imageBuilder);
 
-        Layer l = Layer.FromDirectory(publishDirectory, "/app", false);
+        Layer l = Layer.FromDirectory(publishDirectory, "/app", false, imageBuilder.ManifestMediaType);
 
         imageBuilder.AddLayer(l);
 
@@ -103,7 +103,7 @@ public async Task ApiEndToEndWithLocalLoad()
             cancellationToken: default).ConfigureAwait(false);
         Assert.NotNull(imageBuilder);
 
-        Layer l = Layer.FromDirectory(publishDirectory, "/app", false);
+        Layer l = Layer.FromDirectory(publishDirectory, "/app", false, imageBuilder.ManifestMediaType);
 
         imageBuilder.AddLayer(l);
 
@@ -144,7 +144,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad()
             cancellationToken: default).ConfigureAwait(false);
         Assert.NotNull(imageBuilder);
 
-        Layer l = Layer.FromDirectory(publishDirectory, "/app", false);
+        Layer l = Layer.FromDirectory(publishDirectory, "/app", false, imageBuilder.ManifestMediaType);
 
         imageBuilder.AddLayer(l);
 
@@ -489,7 +489,7 @@ public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform,
             cancellationToken: default).ConfigureAwait(false);
         Assert.NotNull(imageBuilder);
 
-        Layer l = Layer.FromDirectory(publishDirectory, isWin ? "C:\\app" : "/app", isWin);
+        Layer l = Layer.FromDirectory(publishDirectory, isWin ? "C:\\app" : "/app", isWin, imageBuilder.ManifestMediaType);
 
         imageBuilder.AddLayer(l);
         imageBuilder.SetWorkingDirectory(workingDir);

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/LayerEndToEndTests.cs

@@ -29,7 +29,7 @@ public void SingleFileInFolder()
 
         File.WriteAllText(testFilePath, testString);
 
-        Layer l = Layer.FromDirectory(directory: folder.Path, containerPath: "/app", false);
+        Layer l = Layer.FromDirectory(directory: folder.Path, containerPath: "/app", false, SchemaTypes.DockerManifestV2);
 
         Console.WriteLine(l.Descriptor);
 
@@ -54,7 +54,7 @@ public void SingleFileInFolderWindows()
 
         File.WriteAllText(testFilePath, testString);
 
-        Layer l = Layer.FromDirectory(directory: folder.Path, containerPath: "C:\\app", true);
+        Layer l = Layer.FromDirectory(directory: folder.Path, containerPath: "C:\\app", true, SchemaTypes.DockerManifestV2);
 
         var allEntries = LoadAllTarEntries(l.BackingFile);
         Assert.True(allEntries.TryGetValue("Files", out var filesEntry) && filesEntry.EntryType == TarEntryType.Directory, "Missing Files directory entry");