@@ -81,13 +81,13 @@ public static void DockerCreateManifest(this BuildContextBase context, DockerIma
8181 {
8282 var manifestCreateSettings = new DockerManifestCreateSettings { Amend = true } ;
8383 var amd64Tag = $ "{ tag } -{ Architecture . Amd64 . ToSuffix ( ) } ";
84+ var arm64Tag = $ "{ tag } -{ Architecture . Arm64 . ToSuffix ( ) } ";
8485 if ( skipArm64Image )
8586 {
8687 context . DockerManifestCreate ( manifestCreateSettings , tag , amd64Tag ) ;
8788 }
8889 else
8990 {
90- var arm64Tag = $ "{ tag } -{ Architecture . Arm64 . ToSuffix ( ) } ";
9191 context . DockerManifestCreate ( manifestCreateSettings , tag , amd64Tag , arm64Tag ) ;
9292 }
9393 }
@@ -98,15 +98,15 @@ public static void DockerPushManifest(this BuildContextBase context, DockerImage
9898 var manifestTags = context . GetDockerTags ( dockerImage ) ;
9999 foreach ( var tag in manifestTags )
100100 {
101- context . DockerManifestPush ( new DockerManifestPushSettings { Purge = true } , tag ) ;
101+ context . DockerManifestPush ( new ( ) { Purge = true } , tag ) ;
102102 }
103103 }
104104
105105 public static void DockerPullImage ( this ICakeContext context , DockerImage dockerImage )
106106 {
107107 var tag = $ "{ dockerImage . DockerImageName ( ) } :{ dockerImage . Distro } -sdk-{ dockerImage . TargetFramework } ";
108108 var platform = $ "linux/{ dockerImage . Architecture . ToString ( ) . ToLower ( ) } ";
109- context . DockerPull ( new DockerImagePullSettings { Platform = platform } , tag ) ;
109+ context . DockerPull ( new ( ) { Platform = platform } , tag ) ;
110110 }
111111
112112 public static void DockerTestImage ( this BuildContextBase context , DockerImage dockerImage )
@@ -124,10 +124,7 @@ public static void DockerTestArtifact(this BuildContextBase context, DockerImage
124124 context . DockerTestRun ( tag , dockerImage . Architecture , "sh" , cmd ) ;
125125 }
126126
127- private static void DockerBuild (
128- this ICakeContext context ,
129- DockerImageBuildSettings settings ,
130- string path , params string [ ] args )
127+ private static void DockerBuild ( this ICakeContext context , DockerImageBuildSettings settings , string path , params string [ ] args )
131128 {
132129 GenericDockerRunner < DockerImageBuildSettings > genericDockerRunner =
133130 new ( context . FileSystem , context . Environment , context . ProcessRunner , context . Tools ) ;
@@ -235,27 +232,4 @@ private static DockerContainerRunSettings GetDockerRunSettings(this BuildContext
235232
236233 return settings ;
237234 }
238- /*private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
239- {
240- if (string.IsNullOrEmpty(image))
241- {
242- throw new ArgumentNullException(nameof(image));
243- }
244- var runner = new GenericDockerRunner<DockerContainerRunSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
245- List<string> arguments = new()
246- {
247- image
248- };
249- if (!string.IsNullOrEmpty(command))
250- {
251- arguments.Add(command);
252- if (args.Length > 0)
253- {
254- arguments.AddRange(args);
255- }
256- }
257-
258- var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
259- return string.Join("\n", result);
260- }*/
261235}
0 commit comments