hack image

Author: Emilgardis

Dockerfile.hack

@@ -0,0 +1,2 @@
+ARG CROSS_IMAGE
+FROM $CROSS_IMAGE

xtask/src/build_docker_image.rs

@@ -77,14 +77,17 @@ fn locate_dockerfile(
     cross_toolchain_root: &Path,
 ) -> cross::Result<(crate::ImageTarget, String)> {
     let dockerfile_name = format!("Dockerfile.{target}");
-    let dockerfile_root = if cross_toolchain_root.join(&dockerfile_name).exists() {
+    let _dockerfile_root = if cross_toolchain_root.join(&dockerfile_name).exists() {
         &cross_toolchain_root
     } else if docker_root.join(&dockerfile_name).exists() {
         &docker_root
     } else {
         eyre::bail!("unable to find dockerfile for target \"{target}\"");
     };
-    let dockerfile = dockerfile_root.join(dockerfile_name).to_utf8()?.to_string();
+    let dockerfile = super::util::project_dir(&mut MessageInfo::default())?
+        .join("Dockerfile.hack")
+        .to_utf8()?
+        .to_string();
     Ok((target, dockerfile))
 }
 
@@ -243,6 +246,11 @@ pub fn build_docker_image(
             docker_build.args(&["--build-arg", "VERBOSE=1"]);
         }
 
+        docker_build.args([
+            "--build-arg",
+            &format!("CROSS_IMAGE={}", target.image_name(&repository, "0.2.4")),
+        ]);
+
         if target.needs_workspace_root_context() {
             docker_build.arg(&root);
         } else {