github/docker-tidy
0
0
Fork 0
mirror of https://github.com/thegeeklab/docker-tidy.git synced 2024-11-25 13:40:40 +00:00
Code Issues Projects Releases Wiki Activity

fix formatting of exclude_container_labels

Browse Source
This commit is contained in:
Robert Kaussow 2020-03-22 17:49:48 +01:00
parent e3a26d0874
commit 50fa054709
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1 +1,3 @@
* Initial release after fork * BUGFIX
* fix timedelta validation for env vars
* fix formatting of `exclude_container_labels`

5
dockertidy/GarbageCollector.py
View File

@ -278,7 +278,7 @@ class GarbageCollector:
config = self.config.config config = self.config.config
exclude_labels = [] exclude_labels = []
for exclude_label_arg in config["gc"]["exclude_container_label"]: for exclude_label_arg in config["gc"]["exclude_container_labels"]:
split_exclude_label = exclude_label_arg.split("=", 1) split_exclude_label = exclude_label_arg.split("=", 1)
exclude_label_key = split_exclude_label[0] exclude_label_key = split_exclude_label[0]
if len(split_exclude_label) == 2: if len(split_exclude_label) == 2:
@ -291,7 +291,7 @@ class GarbageCollector:
value=exclude_label_value, value=exclude_label_value,
) )
) )
return exclude_labels config["gc"]["exclude_container_labels"] = exclude_labels
def _get_docker_client(self): def _get_docker_client(self):
config = self.config.config config = self.config.config
@ -304,6 +304,7 @@ class GarbageCollector:
"""Garbage collector main method.""" """Garbage collector main method."""
self.logger.info("Start garbage collection") self.logger.info("Start garbage collection")
config = self.config.config config = self.config.config
self._format_exclude_labels()
if config["gc"]["max_container_age"]: if config["gc"]["max_container_age"]:
self.cleanup_containers() self.cleanup_containers()