suggest that buildx needs to be available

Author: Emilgardis

src/bin/commands/images.rs

@@ -276,7 +276,7 @@ pub fn list_images(
             map.get_mut(&target).expect("map must have key").push(image);
         }
     }
-    let mut keys: Vec<&str> = map.iter().map(|(k, _)| k.as_ref()).collect();
+    let mut keys: Vec<&str> = map.keys().map(|k| k.as_ref()).collect();
     keys.sort_unstable();
 
     let print_string =

src/docker/custom.rs

@@ -163,7 +163,32 @@ impl<'a> Dockerfile<'a> {
             docker_build.arg(paths.host_root());
         }
 
-        docker_build.run(msg_info, true)?;
+        let mut res = docker_build.run(msg_info, true).with_warning(|| {
+            format!(
+                "call to {} failed",
+                options
+                    .engine
+                    .path
+                    .file_name()
+                    .and_then(|s| s.to_str())
+                    .map_or_else(|| "container engine", |s| s)
+            )
+        });
+
+        // FIXME: Inspect the error message, while still inheriting stdout on verbose mode to
+        // conditionally apply this suggestion and note. This could then inspect if a help string is emitted,
+        // if the daemon is not running, etc.
+        if docker::Engine::has_buildkit() {
+            res = res
+                .suggestion("is `buildx` available for the container engine?")
+                .with_note(|| {
+                    format!(
+                        "disable the `buildkit` dependency optionally with `{}=1`",
+                        docker::Engine::CROSS_CONTAINER_ENGINE_NO_BUILDKIT_ENV
+                    )
+                });
+        }
+        res?;
         Ok(image_name)
     }
 

src/docker/engine.rs

@@ -69,6 +69,8 @@ pub struct Engine {
 }
 
 impl Engine {
+    pub const CROSS_CONTAINER_ENGINE_NO_BUILDKIT_ENV: &'static str =
+        "CROSS_CONTAINER_ENGINE_NO_BUILDKIT";
     pub fn new(
         in_docker: Option<bool>,
         is_remote: Option<bool>,
@@ -135,7 +137,7 @@ impl Engine {
 
     #[must_use]
     pub fn has_buildkit() -> bool {
-        !env::var("CROSS_CONTAINER_ENGINE_NO_BUILDKIT")
+        !env::var(Self::CROSS_CONTAINER_ENGINE_NO_BUILDKIT_ENV)
             .map(|x| bool_from_envvar(&x))
             .unwrap_or_default()
     }