fixes

Signed-off-by: Pierre Fenoll <[email protected]>

Author: fenollp

rustcbuildx/src/base.rs

@@ -25,7 +25,7 @@ impl BaseImage {
     #[must_use]
     pub(crate) fn base(&self) -> String {
         match self {
-            Self::Image(img) => img.trim_start_matches("docker-image://").to_owned(),
+            Self::Image(img) => img.clone(),
             Self::RustcV(RustcV { base, .. }) if base.is_empty() => {
                 "docker.io/library/debian:12-slim".to_owned()
             }
@@ -43,6 +43,7 @@ impl BaseImage {
 
     pub(crate) fn block(&self) -> String {
         let base = self.base();
+        let base = base.trim_start_matches("docker-image://");
 
         if let BaseImage::RustcV(RustcV { version, commit, date, channel, .. }) = self {
             log::trace!("{version} + {commit}");

rustcbuildx/src/main.rs

@@ -364,6 +364,7 @@ async fn do_wrap_rustc(
 
         let rustc_stage = input.to_string().replace(['/', '.'], "-");
         let rustc_stage = Stage::new(format!("cwd-{crate_id}-{rustc_stage}"))?;
+        // let rustc_stage = Stage::new("cwd")?;
         (None, rustc_stage)
     } else {
         bail!("Unexpected input file {input:?}")

rustcbuildx/src/md.rs

@@ -64,7 +64,11 @@ impl Md {
             if visited.insert(name.to_owned()) {
                 dockerfile.push_str(script);
             }
+        } else {
+            // Otherwise, write it back in
+            dockerfile.push_str(script);
         }
+
         for DockerfileStage { name, script } in stages {
             if name == filter {
                 continue;