Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(container): add optional ingored_prefixes to ignore multiple tags #667

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,4 @@
# containers = ["archlinux-latest"]
[containers]
# ignored_containers = ["ghcr.io/rancher-sandbox/rancher-desktop/rdx-proxy:latest"]
# ingored_prefixes = ["rancher/"]
8 changes: 8 additions & 0 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ pub struct Include {
pub struct Containers {
#[merge(strategy = crate::utils::merge_strategies::vec_prepend_opt)]
ignored_containers: Option<Vec<String>>,
ignored_prefixes: Option<Vec<String>>,
}

#[derive(Deserialize, Default, Debug, Merge)]
Expand Down Expand Up @@ -853,6 +854,13 @@ impl Config {
self.config_file.git.as_ref().and_then(|git| git.repos.as_ref())
}

/// The list of docker/podman container prefixes to ignore.
pub fn containers_ignored_prefixes(&self) -> Option<&Vec<String>> {
self.config_file
.containers
.as_ref()
.and_then(|containers| containers.ignored_prefixes.as_ref())
}
/// The list of docker/podman containers to ignore.
pub fn containers_ignored_tags(&self) -> Option<&Vec<String>> {
self.config_file
Expand Down
24 changes: 21 additions & 3 deletions src/steps/containers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ impl Display for Container {
/// "REGISTRY/[PATH/]CONTAINER_NAME:TAG"
///
/// Containers specified in `ignored_containers` will be filtered out.
fn list_containers(crt: &Path, ignored_containers: Option<&Vec<String>>) -> Result<Vec<Container>> {
fn list_containers(
crt: &Path,
ignored_containers: Option<&Vec<String>>,
ignored_prefixes: Option<&Vec<String>>,
) -> Result<Vec<Container>> {
debug!(
"Querying '{} image ls --format \"{{{{.Repository}}}}:{{{{.Tag}}}}/{{{{.ID}}}}\"' for containers",
crt.display()
Expand Down Expand Up @@ -85,6 +89,16 @@ fn list_containers(crt: &Path, ignored_containers: Option<&Vec<String>>) -> Resu
assert_eq!(split_res.len(), 2);
let (repo_tag, image_id) = (split_res[0], split_res[1]);

if let Some(ignored_prefixes) = ignored_prefixes {
if ignored_prefixes
.iter()
.any(|ignored_prefix| repo_tag.starts_with(ignored_prefix))
{
debug!("Skipping ignored container '{}' due to a matching prefix", line);
continue;
}
}

if let Some(ignored_containers) = ignored_containers {
if ignored_containers
.iter()
Expand Down Expand Up @@ -121,8 +135,12 @@ pub fn run_containers(ctx: &ExecutionContext) -> Result<()> {

print_separator("Containers");
let mut success = true;
let containers =
list_containers(&crt, ctx.config().containers_ignored_tags()).context("Failed to list Docker containers")?;
let containers = list_containers(
&crt,
ctx.config().containers_ignored_tags(),
ctx.config().containers_ignored_prefixes(),
)
.context("Failed to list Docker containers")?;
debug!("Containers to inspect: {:?}", containers);

for container in containers.iter() {
Expand Down
Loading