From 50fa0547094eb938d00f1275dfef6126b56fc915 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 22 Mar 2020 17:49:48 +0100 Subject: [PATCH] fix formatting of exclude_container_labels --- CHANGELOG.md | 4 +++- dockertidy/GarbageCollector.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e41043..231e05d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -* Initial release after fork +* BUGFIX + * fix timedelta validation for env vars + * fix formatting of `exclude_container_labels` diff --git a/dockertidy/GarbageCollector.py b/dockertidy/GarbageCollector.py index 3f5c66b..6c82684 100644 --- a/dockertidy/GarbageCollector.py +++ b/dockertidy/GarbageCollector.py @@ -278,7 +278,7 @@ class GarbageCollector: config = self.config.config 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) exclude_label_key = split_exclude_label[0] if len(split_exclude_label) == 2: @@ -291,7 +291,7 @@ class GarbageCollector: value=exclude_label_value, ) ) - return exclude_labels + config["gc"]["exclude_container_labels"] = exclude_labels def _get_docker_client(self): config = self.config.config @@ -304,6 +304,7 @@ class GarbageCollector: """Garbage collector main method.""" self.logger.info("Start garbage collection") config = self.config.config + self._format_exclude_labels() if config["gc"]["max_container_age"]: self.cleanup_containers()