Rename default_docker_base_image to default_base_image
@@ -67,7 +67,7 @@ const DEFAULT_USER_AND_GROUP_ID: u32 = 42;
const DEFAULT_HAB_UID: u32 = 84;
const DEFAULT_HAB_GID: u32 = 84;
-fn default_docker_base_image() -> Result<String> {
+fn default_base_image() -> Result<String> {
#[cfg(unix)]
{
Ok(DEFAULT_BASE_IMAGE.to_string())
@@ -147,11 +147,11 @@ impl TryFrom<&ArgMatches<'_>> for BuildSpec {
.expect("No package specified")
.map(str::to_string)
.collect(),
- base_image: m.value_of("BASE_IMAGE")
+ base_image:
+ m.value_of("BASE_IMAGE")
.map(str::to_string)
.unwrap_or_else(|| {
- default_docker_base_image().expect("No base image \
- supported")
+ default_base_image().expect("No base image supported")
}),
multi_layer: m.is_present("MULTI_LAYER"), })
}
