diff --git a/lib/apps/fabro-server/src/run_compiler.rs b/lib/apps/fabro-server/src/run_compiler.rs index 16f7e5bbf..a018f46d0 100644 --- a/lib/apps/fabro-server/src/run_compiler.rs +++ b/lib/apps/fabro-server/src/run_compiler.rs @@ -586,7 +586,7 @@ fn resolve_dockerfiles( config_path: &ManifestPath, files: &HashMap, ) -> Result<()> { - for image in layer.image_layers_mut() { + for image in layer.environment_images_mut() { resolve_dockerfile(image, config_path, files)?; } Ok(()) diff --git a/lib/components/fabro-manifest/src/workflow_bundler.rs b/lib/components/fabro-manifest/src/workflow_bundler.rs index 3e2e5a9a9..5a4efc13a 100644 --- a/lib/components/fabro-manifest/src/workflow_bundler.rs +++ b/lib/components/fabro-manifest/src/workflow_bundler.rs @@ -325,7 +325,7 @@ impl<'a> WorkflowBundler<'a> { .parent() .unwrap_or_else(|| Path::new(".")); - for image in layer.image_layers() { + for image in layer.environment_images() { self.collect_environment_dockerfile(files, base_dir, config_path, image)?; } Ok(()) diff --git a/lib/components/fabro-workflow-version/src/lib.rs b/lib/components/fabro-workflow-version/src/lib.rs index cd7ad8347..be4a40ee7 100644 --- a/lib/components/fabro-workflow-version/src/lib.rs +++ b/lib/components/fabro-workflow-version/src/lib.rs @@ -127,7 +127,7 @@ fn validate_config(version: &WorkflowVersion) -> Result<(), WorkflowVersionError } } - for image in layer.image_layers() { + for image in layer.environment_images() { validate_dockerfile(version, &config_path, image)?; } Ok(()) diff --git a/lib/foundation/fabro-config/src/layers/settings.rs b/lib/foundation/fabro-config/src/layers/settings.rs index 330c1cdcb..4863c8833 100644 --- a/lib/foundation/fabro-config/src/layers/settings.rs +++ b/lib/foundation/fabro-config/src/layers/settings.rs @@ -110,7 +110,7 @@ impl SettingsLayer { /// layer". The dockerfile walkers (run compilation, manifest bundling, /// workflow-version validation) all iterate through here so a new /// image-bearing location only needs to be added once. - pub fn image_layers(&self) -> impl Iterator { + pub fn environment_images(&self) -> impl Iterator { self.environments .values() .filter_map(|environment| environment.image.as_ref()) @@ -122,8 +122,8 @@ impl SettingsLayer { ) } - /// Mutable variant of [`Self::image_layers`]. - pub fn image_layers_mut(&mut self) -> impl Iterator { + /// Mutable variant of [`Self::environment_images`]. + pub fn environment_images_mut(&mut self) -> impl Iterator { self.environments .values_mut() .filter_map(|environment| environment.image.as_mut())