admin/registry-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always keep tags passed in --keep-tags

Browse Source 
Fixes #84.
This commit is contained in:
Koen Wilde
2019-12-17 17:02:50 +01:00
parent 31112dd8b8
commit 3c5b90d3e9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
registry.py
View File

@@ -811,9 +811,11 @@ def main_loop(args):
print(" layer: {0}".format( print(" layer: {0}".format(
layer['blobSum'])) layer['blobSum']))
# add tags to "tags_to_keep" list, if we have regexp "tags_to_keep" # add tags to "tags_to_keep" list if we have regexp "tags_to_keep"
# entries or a number of hours for "keep_by_hours": # entries, a number of hours for "keep_by_hours" or if the user
# explicitly specified tags to always keep.
keep_tags = [] keep_tags = []
keep_tags.extend(args.keep_tags)
if args.keep_tags_like: if args.keep_tags_like:
keep_tags.extend(get_tags_like(args.keep_tags_like, tags_list)) keep_tags.extend(get_tags_like(args.keep_tags_like, tags_list))
if args.keep_by_hours: if args.keep_by_hours:
@@ -842,7 +844,6 @@ def main_loop(args):
# delete tags by age in hours # delete tags by age in hours
if args.delete_by_hours: if args.delete_by_hours:
keep_tags.extend(args.keep_tags)
delete_tags_by_age(registry, image_name, args.dry_run, delete_tags_by_age(registry, image_name, args.dry_run,
args.delete_by_hours, keep_tags) args.delete_by_hours, keep_tags)