(build) improve docker manifest publishing

Author: arturcic

build/common/Utilities/DockerContextExtensions.cs

@@ -66,15 +66,16 @@ public static void DockerCreateManifest(this BuildContextBase context, DockerIma
         var manifestTags = context.GetDockerTags(dockerImage);
         foreach (var tag in manifestTags)
         {
+            var manifestCreateSettings = new DockerManifestCreateSettings { Amend = true };
             var amd64Tag = $"{tag}-{Architecture.Amd64.ToSuffix()}";
             if (skipArm64Image)
             {
-                context.DockerManifestCreate(tag, amd64Tag);
+                context.DockerManifestCreate(manifestCreateSettings, tag, amd64Tag);
             }
             else
             {
                 var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
-                context.DockerManifestCreate(tag, amd64Tag, arm64Tag);
+                context.DockerManifestCreate(manifestCreateSettings, tag, amd64Tag, arm64Tag);
             }
         }
     }
@@ -84,19 +85,9 @@ public static void DockerPushManifest(this BuildContextBase context, DockerImage
         var manifestTags = context.GetDockerTags(dockerImage);
         foreach (var tag in manifestTags)
         {
-            context.DockerManifestPush(tag);
+            context.DockerManifestPush(new DockerManifestPushSettings { Purge = true }, tag);
         }
     }
-    public static void DockerRemoveManifest(this BuildContextBase context, DockerImage dockerImage)
-    {
-        var manifestTags = context.GetDockerTags(dockerImage);
-        foreach (var tag in manifestTags)
-        {
-            context.DockerManifestRemove(tag);
-        }
-    }
-
-    private static void DockerManifestRemove(this ICakeContext context, string tag) => context.DockerCustomCommand($"manifest rm {tag}");
 
     public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
     {
@@ -190,10 +181,10 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,
             }
         }
 
-        if (!arch.HasValue) return tags;
+        if (!arch.HasValue) return tags.Distinct();
 
         var suffix = arch.Value.ToSuffix();
-        return tags.Select(x => $"{x}-{suffix}");
+        return tags.Select(x => $"{x}-{suffix}").Distinct();
 
     }
     private static string DockerImageName(this DockerImage image) => $"{image.Registry}/{(image.UseBaseImage ? Constants.DockerBaseImageName : Constants.DockerImageName)}";

build/docker/Tasks/DockerManifest.cs

@@ -48,7 +48,6 @@ public override void Run(BuildContext context)
             var arm64DockerImage = group.First(x => x.Architecture == Architecture.Arm64);
             context.DockerCreateManifest(amd64DockerImage, context.SkipArm64Image(arm64DockerImage));
             context.DockerPushManifest(amd64DockerImage);
-            context.DockerRemoveManifest(amd64DockerImage);
         }
     }
 }