Skip to content

Update CleanDockerImages inline with code comments #373

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update CleanDockerImages inline with code comments #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions cleanup/cleanDockerImages/cleanDockerImages.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ def buildParentRepoPaths(path, dryRun) {
def deleted = [], oldSet = [], imagesPathMap = [:], imagesCount = [:]
def parentInfo = repositories.getItemInfo(path)
simpleTraverse(parentInfo, oldSet, imagesPathMap, imagesCount)
for (img in oldSet) {
deleted << img.id
if (!dryRun) repositories.delete(img)
}
deleted = oldSet
for (key in imagesPathMap.keySet()) {
def repoList = imagesPathMap[key]
def maxImagesCount = imagesCount[key]
Expand Down Expand Up @@ -84,7 +81,8 @@ def simpleTraverse(parentInfo, oldSet, imagesPathMap, imagesCount) {
// - aggregate the image info to group by image and sort by create
// date for maxCount policy
if (checkDaysPassedForDelete(childItem)) {
log.debug("Adding to OLD MAP: $parentRepoPath")
log.debug("${dryRun? 'Would have deleted' : 'Deleting'}: $parentRepoPath")
if (!dryRun) repositories.delete(img)
oldSet << parentRepoPath
} else if ((maxCount = getMaxCountForDelete(childItem)) > 0) {
log.debug("Adding to IMAGES MAP: $parentRepoPath")
Expand Down