feature(cli): extend container tool to buildah

Signed-off-by: Marcel Hild <hild@b4mad.net>

Author: durandom

packages/cli/src/commands/index.ts

@@ -177,12 +177,16 @@ export function registerScriptCommand(program: Command) {
     )
     .option(
       '--use-docker',
-      'By defult, the command uses podman to build the container image. Use this flag to use docker instead.',
-      false,
+      'Use Docker as the container tool (deprecated, use --container-tool instead)',
+    )
+    .option(
+      '--container-tool <tool>',
+      'Container tool to use for building the image. Allowed values: "docker", "podman", "buildah". Default is "buildah".',
+      'buildah',
     )
     .option(
       '--platform <platform>',
-      'Platform to use when building the container image. Default is "linux/amd64". Can be set to "" to not set --platfrom flag in builder command.',
+      'Platform to use when building the container image. Default is "linux/amd64". Can be set to "" to not set --platform flag in builder command.',
       'linux/amd64',
     )
     .action(

packages/cli/src/commands/package-dynamic-plugins/command.ts

@@ -13,24 +13,63 @@ import { paths } from '../../lib/paths';
 import { Task } from '../../lib/tasks';
 
 export async function command(opts: OptionValues): Promise<void> {
-  const { exportTo, forceExport, preserveTempDir, tag, useDocker, platform } =
-    opts;
+  const {
+    exportTo,
+    forceExport,
+    preserveTempDir,
+    tag,
+    containerTool = 'docker',
+    platform,
+  } = opts;
   if (!exportTo && !tag) {
     Task.error(
       `Neither ${chalk.white('--export-to')} or ${chalk.white('--tag')} was specified, either specify ${chalk.white('--export-to')} to export plugins to a directory or ${chalk.white('--tag')} to export plugins to a container image`,
     );
     return;
   }
-  const containerTool = useDocker ? 'docker' : 'podman';
+
+  // Validate containerTool value
+  const allowedTools = ['docker', 'podman', 'buildah'];
+  if (!allowedTools.includes(containerTool)) {
+    Task.error(
+      `Invalid value for --container-tool: ${containerTool}. Allowed values are: ${allowedTools.join(', ')}`,
+    );
+    return;
+  }
+
+  // Determine the build command and version check command
+  let buildCommand = containerTool === 'buildah' ? 'bud' : 'build';
+  let containerToolCmd = containerTool;
+
   // check if the container tool is available, skip if just exporting the plugins to a directory
   if (!exportTo) {
+    let toolAvailable = false;
     try {
-      await Task.forCommand(`${containerTool} --version`);
+      await Task.forCommand(`${containerToolCmd} --version`);
+      toolAvailable = true;
     } catch (e) {
-      Task.error(
-        `Unable to find ${containerTool} command: ${e}\nMake sure that ${containerTool} is installed and available in your PATH.`,
-      );
-      return;
+      // Fallback: try docker if not already docker
+      if (containerToolCmd !== 'docker') {
+        try {
+          await Task.forCommand(`docker --version`);
+          Task.log(
+            `Warning: Unable to find ${containerToolCmd} command. Falling back to docker.`,
+          );
+          containerToolCmd = 'docker';
+          buildCommand = 'build';
+          toolAvailable = true;
+        } catch (dockerErr) {
+          Task.error(
+            `Unable to find ${containerToolCmd} command: ${e}\nTried falling back to docker, but docker is also not available: ${dockerErr}\nMake sure that a supported container tool is installed and available in your PATH.`,
+          );
+          return;
+        }
+      } else {
+        Task.error(
+          `Unable to find docker command: ${e}\nMake sure that docker is installed and available in your PATH.`,
+        );
+        return;
+      }
     }
   }
   const workspacePackage = (await fs.readJson(
@@ -202,16 +241,16 @@ export async function command(opts: OptionValues): Promise<void> {
         flags.push(`--platform ${platform}`);
       }
       // run the command to generate the image
-      Task.log(`Creating image using ${containerTool}`);
-      await Task.forCommand(
-        `echo "from scratch
+      Task.log(`Creating image using ${containerToolCmd}`);
+      const buildahInput = `from scratch
 COPY . .
-" | ${containerTool} build \
-  ${flags.join(' ')} \
-  -t '${tag}' -f - .
-    `,
-        { cwd: tmpDir },
-      );
+`;
+      const buildCmd =
+        containerToolCmd === 'buildah'
+          ? `echo "${buildahInput}" | buildah bud ${flags.join(' ')} -t '${tag}' -f - .`
+          : `echo "${buildahInput}" | ${containerToolCmd} build ${flags.join(' ')} -t '${tag}' -f - .`;
+
+      await Task.forCommand(buildCmd, { cwd: tmpDir });
       Task.log(`Successfully built image ${tag} with following plugins:`);
       for (const plugin of pluginRegistryMetadata) {
         Task.log(`  ${chalk.white(Object.keys(plugin)[0])}`);