Add command option and pass to publish method

! needs to be last option passed to tool, as it might cmd values might be options themselves

Author: ebariaux

Plugins/ContainerImageBuilder/main.swift

@@ -99,8 +99,8 @@ extension PluginError: CustomStringConvertible {
         let helperURL = try context.tool(named: "containertool").url
         let helperArgs =
             (FileManager.default.fileExists(atPath: resources.path) ? ["--resources", resources.path] : [])
-            + extractor.remainingArguments
             + builtExecutables.map { $0.url.path }
+            + extractor.remainingArguments
         let helperEnv = ProcessInfo.processInfo.environment.filter { $0.key.starts(with: "CONTAINERTOOL_") }
 
         let err = Pipe()

Sources/containertool/Extensions/RegistryClient+publish.swift

@@ -25,6 +25,7 @@ func publishContainerImage<Source: ImageSource, Destination: ImageDestination>(
     destination: Destination,
     architecture: String,
     os: String,
+    cmd: [String],
     resources: [String],
     tag: String?,
     verbose: Bool,
@@ -80,7 +81,7 @@ func publishContainerImage<Source: ImageSource, Destination: ImageDestination>(
     // and override the entrypoint.
     var inheritedConfiguration = baseImageConfiguration.config ?? .init()
     inheritedConfiguration.Entrypoint = ["/\(executableURL.lastPathComponent)"]
-    inheritedConfiguration.Cmd = []
+    inheritedConfiguration.Cmd = cmd
     inheritedConfiguration.WorkingDir = "/"
 
     let configuration = ImageConfiguration(

Sources/containertool/containertool.swift

@@ -64,6 +64,9 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
 
         @Option(help: "Operating system")
         var os: String?
+
+        @Option(parsing: .remaining, help: "Default arguments to pass to the entrypoint process")
+        var cmd: [String] = []
     }
 
     @OptionGroup(title: "Image configuration options")
@@ -222,6 +225,7 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
             destination: destination,
             architecture: architecture,
             os: os,
+            cmd: imageConfigurationOptions.cmd,
             resources: imageBuildOptions.resources,
             tag: repositoryOptions.tag,
             verbose: verbose,