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

Merge pull request #9 from thomasme/master

Browse Source 
Sort tags before keeping last versions
This commit is contained in:
andrey-pohilko
2017-02-10 11:36:04 +06:00
committed by GitHub
parent eaca8bf1df b718065e38
commit 5e0b82c5c3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
registry.py
View File

@@ -60,16 +60,18 @@ class Registry:
self.hostname = host self.hostname = host
self.no_validate_ssl = no_validate_ssl self.no_validate_ssl = no_validate_ssl
def __atoi(self, text): @staticmethod
def __atoi(text):
return int(text) if text.isdigit() else text return int(text) if text.isdigit() else text
def __natural_keys(self, text): @staticmethod
def natural_keys(text):
''' '''
alist.sort(key=natural_keys) sorts in human order alist.sort(key=natural_keys) sorts in human order
http://nedbatchelder.com/blog/200712/human_sorting.html http://nedbatchelder.com/blog/200712/human_sorting.html
(See Toothy's implementation in the comments) (See Toothy's implementation in the comments)
''' '''
return [ self.__atoi(c) for c in re.split('(\d+)', text) ] return [ Registry.__atoi(c) for c in re.split('(\d+)', text) ]
def send(self, path, method="GET"): def send(self, path, method="GET"):
try: try:
@@ -107,7 +109,7 @@ class Registry:
tags_list = json.loads(result.text)['tags'] tags_list = json.loads(result.text)['tags']
if tags_list != None: if tags_list != None:
tags_list.sort(key=self.__natural_keys) tags_list.sort(key=Registry.natural_keys)
return tags_list return tags_list
@@ -401,7 +403,7 @@ def main_loop(args):
if args.delete_all: if args.delete_all:
tags_list_to_delete = list(tags_list) tags_list_to_delete = list(tags_list)
else: else:
tags_list_to_delete = list(tags_list)[:-keep_last_versions] tags_list_to_delete = sorted(tags_list, key=Registry.natural_keys)[:-keep_last_versions]
delete_tags( delete_tags(
registry, image_name, args.dry_run, registry, image_name, args.dry_run,