Skip to content

Commit 289cbe3

Browse files
committed
chore(boil): Simplify tag used for cache
1 parent e3c4829 commit 289cbe3

2 files changed

Lines changed: 7 additions & 16 deletions

File tree

rust/boil/src/core/bakefile.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,11 @@ impl Bakefile {
365365
&image_name,
366366
);
367367

368-
let cache_image_index_manifest_tag =
369-
utils::format_image_cache_index_manifest_tag(
370-
&image_version,
371-
&metadata.vendor_tag_prefix,
372-
&cli_args.image_version,
373-
);
368+
let cache_image_index_manifest_tag = utils::format_image_index_manifest_tag(
369+
&image_version,
370+
&metadata.vendor_tag_prefix,
371+
&cli_args.image_version,
372+
);
374373

375374
let cache_image_manifest_tag = utils::format_image_manifest_tag(
376375
&cache_image_index_manifest_tag,

rust/boil/src/utils.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ pub fn format_image_index_manifest_tag(
4343
format!("{image_version}-{vendor_tag_prefix}{vendor_image_version}")
4444
}
4545

46-
pub fn format_image_cache_index_manifest_tag(
47-
image_version: &str,
48-
vendor_tag_prefix: &str,
49-
vendor_image_version: &str,
50-
) -> String {
51-
let tag =
52-
format_image_index_manifest_tag(image_version, vendor_tag_prefix, vendor_image_version);
53-
format!("{tag}-cache")
54-
}
55-
5646
/// Formats and returns the image manifest tag, eg. `1.4.2-stackable25.7.0-amd64`.
5747
///
5848
/// The `strip_architecture` parameter controls if the architecture is included in the tag.
@@ -69,6 +59,8 @@ pub fn format_image_manifest_tag(
6959
}
7060
}
7161

62+
// TODO (@Techassi): Can we design this better? Maybe add a new struct/type which implements a bunch
63+
// of associated functions.
7264
#[allow(clippy::too_many_arguments)]
7365
pub fn format_image_tag_parts(
7466
image_registry: &HostPort,

0 commit comments

Comments
 (0)