fix detection of container cli tool

Author: sebsto

Plugins/AWSLambdaBuilder/Plugin.swift

@@ -28,7 +28,6 @@ struct AWSLambdaBuilder: CommandPlugin {
         let packageID: String = context.package.id
         let packageDisplayName = context.package.displayName
         let packageDirectory = context.package.directoryURL
-        let dockerToolPath = try context.tool(named: "docker").url
         let zipToolPath = try context.tool(named: "zip").url
 
         // extract arguments that require PluginContext to fully resolve
@@ -39,6 +38,18 @@ struct AWSLambdaBuilder: CommandPlugin {
         let productsArgument = argumentExtractor.extractOption(named: "products")
         let configurationArgument = argumentExtractor.extractOption(named: "configuration")
 
+        // Resolve the container CLI that matches the requested cross-compilation method.
+        // The plugin sandbox can only run tools it resolves up front, so we must pick the right
+        // binary here — `container` for `--cross-compile container`, `docker` otherwise. Extracting
+        // these options only peeks them for the plugin; the original `arguments` (which the helper
+        // re-parses) is still forwarded unchanged below.
+        // `--container-cli` is a deprecated alias for `--cross-compile`.
+        let crossCompileArgument = argumentExtractor.extractOption(named: "cross-compile")
+        let containerCliArgument = argumentExtractor.extractOption(named: "container-cli")
+        let crossCompileMethod = (crossCompileArgument.first ?? containerCliArgument.first)?.lowercased()
+        let containerCLIToolName = crossCompileMethod == "container" ? "container" : "docker"
+        let containerToolPath = try context.tool(named: containerCLIToolName).url
+
         if let outputPath = outputPathArgument.first {
             #if os(Linux)
             var isDirectory: Bool = false
@@ -87,7 +98,7 @@ struct AWSLambdaBuilder: CommandPlugin {
                 "--package-id", packageID,
                 "--package-display-name", packageDisplayName,
                 "--package-directory", packageDirectory.path(),
-                "--docker-tool-path", dockerToolPath.path,
+                "--docker-tool-path", containerToolPath.path,
                 "--zip-tool-path", zipToolPath.path,
             ] + arguments
 

Sources/AWSLambdaPluginHelper/lambda-build/Builder.swift

@@ -450,19 +450,35 @@ enum CrossCompileMethod: String, CustomStringConvertible {
         env: [String: String]?,
         command: String
     ) -> [String] {
-        switch self {
-        case .docker, .container:
+        func genericArgs() -> [String] {
             var args: [String] = ["run", "--rm"]
             for mount in mounts {
                 args += ["-v", mount]
             }
             if let env {
                 for (key, value) in env.sorted(by: { $0.key < $1.key }) {
-                    args += ["--env", "\(key)=\(value)"]
+                    args += ["-e", "\(key)=\(value)"]
                 }
             }
             args += ["-w", workingDirectory, baseImage, "bash", "-cl", command]
             return args
+        }
+        switch self {
+        
+        case .docker:
+            return genericArgs()
+
+        case .container:
+            var args = genericArgs()
+
+            // container's runtime needs a bit more memory
+            if self == .container {
+                args.insert("--memory", at: 1)
+                args.insert("4G", at: 2)
+            }
+
+            return args
+            
         case .swiftStaticSdk, .customSdk:
             fatalError("runArguments should not be called for unsupported cross-compile methods")
         }