|
|
@@ -88,8 +88,11 @@ pub async fn serve(
|
|
|
anyhow::bail!("build-node '{}' not in cluster", build_node_name);
|
|
|
}
|
|
|
if !opts.dry_run {
|
|
|
- let build_dir = format!("docker-images/{}", recipe_name);
|
|
|
- let local_dir = std::path::Path::new(&build_dir);
|
|
|
+ let image_dir = recipe
|
|
|
+ .docker_image_dir
|
|
|
+ .clone()
|
|
|
+ .unwrap_or_else(|| recipe_name.to_string());
|
|
|
+ let local_dir = std::path::Path::new("docker-images").join(&image_dir);
|
|
|
if !local_dir.join("build.sh").exists() {
|
|
|
anyhow::bail!(
|
|
|
"No build system at '{}' (missing build.sh)",
|
|
|
@@ -117,7 +120,7 @@ pub async fn serve(
|
|
|
crate::ssh::upload_dir(
|
|
|
config,
|
|
|
build_node,
|
|
|
- local_dir,
|
|
|
+ local_dir.as_path(),
|
|
|
&format!("/tmp/{}-build", recipe_name),
|
|
|
false,
|
|
|
)
|