DataHearth
/
clear-docker-images
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

fix issue with deleting clear-docker-image own image

This commit is contained in:
DataHearth 2022-03-06 04:15:27 +01:00
parent e3e2722234
commit 71543112ee
No known key found for this signature in database
GPG Key ID: E88FD356ACC5F3C4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/images.rs
View File

@ -6,14 +6,24 @@ use std::process::{exit, Command};
use crate::DateArgs; use crate::DateArgs;
use crate::DOCKER_BIN; use crate::DOCKER_BIN;
const GHCR_REPO: &str = "ghcr.io/datahearth/clear-docker-images";
const DOCKER_REPO: &str = "datahearth/clear-docker-images";
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
struct Image { struct Image {
#[serde(deserialize_with = "deserialize_creation_date", rename = "CreatedAt")] // image ID
created_at: i64,
#[serde(rename = "ID")] #[serde(rename = "ID")]
id: String, id: String,
// image repository
#[serde(rename = "Repository")]
repository: String,
// image tag
#[serde(rename = "Tag")] #[serde(rename = "Tag")]
tag: String, tag: String,
// image creation date as UNIX timestamp
#[serde(deserialize_with = "deserialize_creation_date", rename = "CreatedAt")]
created_at: i64,
// image size in MB
#[serde(deserialize_with = "deserialize_size", rename = "Size")] #[serde(deserialize_with = "deserialize_size", rename = "Size")]
size: f32, size: f32,
} }
@ -78,7 +88,7 @@ pub fn process_imgs(
timestamps.start > image.created_at && stop < image.created_at timestamps.start > image.created_at && stop < image.created_at
}); });
if del { if del && (image.repository != GHCR_REPO && image.repository != DOCKER_REPO) {
if !tags.contains(&image.tag) { if !tags.contains(&image.tag) {
ids.push(image.id); ids.push(image.id);