Covert container engine functions in Engine methods.

Author: Alexhuszagh

src/bin/commands/containers.rs

@@ -320,7 +320,8 @@ fn get_cross_volumes(
     msg_info: &mut MessageInfo,
 ) -> cross::Result<Vec<String>> {
     use cross::docker::VOLUME_PREFIX;
-    let stdout = docker::subcommand(engine, "volume")
+    let stdout = engine
+        .subcommand("volume")
         .arg("list")
         .args(["--format", "{{.Name}}"])
         // handles simple regex: ^ for start of line.
@@ -348,7 +349,7 @@ pub fn remove_all_volumes(
 ) -> cross::Result<()> {
     let volumes = get_cross_volumes(engine, msg_info)?;
 
-    let mut command = docker::subcommand(engine, "volume");
+    let mut command = engine.subcommand("volume");
     command.arg("rm");
     if force {
         command.arg("--force");
@@ -370,7 +371,7 @@ pub fn prune_volumes(
     engine: &docker::Engine,
     msg_info: &mut MessageInfo,
 ) -> cross::Result<()> {
-    let mut command = docker::subcommand(engine, "volume");
+    let mut command = engine.subcommand("volume");
     command.args(["prune", "--force"]);
     if execute {
         command.run(msg_info, false).map_err(Into::into)
@@ -421,7 +422,7 @@ pub fn create_persistent_volume(
 
     // create a dummy running container to copy data over
     let mount_prefix = docker::MOUNT_PREFIX;
-    let mut docker = docker::subcommand(engine, "run");
+    let mut docker = engine.subcommand("run");
     docker.args(["--name", &container_id]);
     docker.arg("--rm");
     docker.args(["-v", &format!("{}:{}", volume_id, mount_prefix)]);
@@ -482,7 +483,8 @@ fn get_cross_containers(
     msg_info: &mut MessageInfo,
 ) -> cross::Result<Vec<String>> {
     use cross::docker::VOLUME_PREFIX;
-    let stdout = docker::subcommand(engine, "ps")
+    let stdout = engine
+        .subcommand("ps")
         .arg("-a")
         .args(["--format", "{{.Names}}: {{.State}}"])
         // handles simple regex: ^ for start of line.
@@ -525,13 +527,13 @@ pub fn remove_all_containers(
 
     let mut commands = vec![];
     if !running.is_empty() {
-        let mut stop = docker::subcommand(engine, "stop");
+        let mut stop = engine.subcommand("stop");
         stop.args(&running);
         commands.push(stop);
     }
 
     if !(stopped.is_empty() && running.is_empty()) {
-        let mut rm = docker::subcommand(engine, "rm");
+        let mut rm = engine.subcommand("rm");
         if force {
             rm.arg("--force");
         }

src/bin/commands/images.rs

@@ -166,7 +166,8 @@ fn get_cross_images(
     msg_info: &mut MessageInfo,
     local: bool,
 ) -> cross::Result<Vec<Image>> {
-    let mut images: BTreeSet<_> = cross::docker::subcommand(engine, "images")
+    let mut images: BTreeSet<_> = engine
+        .subcommand("images")
         .args(["--format", "{{.Repository}}:{{.Tag}} {{.ID}}"])
         .args([
             "--filter",
@@ -177,7 +178,8 @@ fn get_cross_images(
         .map(parse_image)
         .collect();
 
-    let stdout = cross::docker::subcommand(engine, "images")
+    let stdout = engine
+        .subcommand("images")
         .args(["--format", "{{.Repository}}:{{.Tag}} {{.ID}}"])
         .run_and_get_stdout(msg_info)?;
     let ids: Vec<_> = images.iter().map(|i| i.id.to_string()).collect();
@@ -238,7 +240,7 @@ fn get_image_target(
             return Ok(target);
         }
     }
-    let mut command = cross::docker::subcommand(engine, "inspect");
+    let mut command = engine.subcommand("inspect");
     command.args([
         "--format",
         &format!(
@@ -332,7 +334,7 @@ fn remove_images(
     force: bool,
     execute: bool,
 ) -> cross::Result<()> {
-    let mut command = docker::subcommand(engine, "rmi");
+    let mut command = engine.subcommand("rmi");
     if force {
         command.arg("--force");
     }

src/docker/custom.rs

@@ -7,7 +7,7 @@ use crate::shell::MessageInfo;
 use crate::{errors::*, file, CommandExt, ToUtf8};
 use crate::{CargoMetadata, TargetTriple};
 
-use super::{get_image_name, parse_docker_opts, path_hash, ImagePlatform};
+use super::{get_image_name, path_hash, Engine, ImagePlatform};
 
 pub const CROSS_CUSTOM_DOCKERFILE_IMAGE_PREFIX: &str = "localhost/cross-rs/cross-custom-";
 
@@ -71,7 +71,7 @@ impl<'a> Dockerfile<'a> {
         msg_info: &mut MessageInfo,
     ) -> Result<String> {
         let uses_zig = options.cargo_variant.uses_zig();
-        let mut docker_build = docker::command(&options.engine);
+        let mut docker_build = options.engine.command();
         match docker::Engine::has_buildkit() {
             true => docker_build.args(["buildx", "build"]),
             false => docker_build.arg("build"),
@@ -147,7 +147,7 @@ impl<'a> Dockerfile<'a> {
         docker_build.args(["--file".into(), path]);
 
         if let Some(build_opts) = options.config.build_opts() {
-            docker_build.args(parse_docker_opts(&build_opts)?);
+            docker_build.args(Engine::parse_opts(&build_opts)?);
         }
 
         let has_output = options.config.build_opts().map_or(false, |opts| {

src/docker/local.rs

@@ -30,10 +30,10 @@ pub(crate) fn run(
     let toolchain_dirs = paths.directories.toolchain_directories();
     let package_dirs = paths.directories.package_directories();
 
-    let mut cmd = cargo_safe_command(options.cargo_variant);
+    let mut cmd = options.cargo_variant.safe_command();
     cmd.args(args);
 
-    let mut docker = subcommand(engine, "run");
+    let mut docker = engine.subcommand("run");
     docker_userns(&mut docker);
 
     options

src/docker/remote.rs

@@ -31,7 +31,7 @@ macro_rules! bail_container_exited {
 
 fn subcommand_or_exit(engine: &Engine, cmd: &str) -> Result<Command> {
     bail_container_exited!();
-    Ok(subcommand(engine, cmd))
+    Ok(engine.subcommand(cmd))
 }
 
 impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> {
@@ -663,7 +663,7 @@ pub(crate) fn run(
     // if we're using a discarded volume.
 
     // 3. create our start container command here
-    let mut docker = subcommand(engine, "run");
+    let mut docker = engine.subcommand("run");
     docker_userns(&mut docker);
     options
         .image
@@ -853,7 +853,7 @@ pub(crate) fn run(
         final_args.push("--target-dir".to_owned());
         final_args.push(target_dir_string);
     }
-    let mut cmd = cargo_safe_command(options.cargo_variant);
+    let mut cmd = options.cargo_variant.safe_command();
     cmd.args(final_args);
 
     // 5. create symlinks for copied data
@@ -901,7 +901,7 @@ symlink_recurse \"${{prefix}}\"
         .wrap_err("when creating symlinks to provide consistent host/mount paths")?;
 
     // 6. execute our cargo command inside the container
-    let mut docker = subcommand(engine, "exec");
+    let mut docker = engine.subcommand("exec");
     docker_user_id(&mut docker, engine.kind);
     docker_envvars(&mut docker, &options, toolchain_dirs, msg_info)?;
     docker_cwd(&mut docker, &paths)?;