From 2e1a08d15a7bc85a845a4703fd86634f87391de4 Mon Sep 17 00:00:00 2001 From: lachmanfrantisek Date: Mon, 16 Apr 2018 19:23:36 +0200 Subject: [PATCH] Correct docs Signed-off-by: lachmanfrantisek --- colin/cli/colin.py | 2 +- colin/core/colin.py | 5 +++-- colin/core/ruleset/ruleset.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/colin/cli/colin.py b/colin/cli/colin.py index d97dad10..af853f8e 100644 --- a/colin/cli/colin.py +++ b/colin/cli/colin.py @@ -58,7 +58,7 @@ def cli(): help="Verbose mode.") def check(target, ruleset, ruleset_file, debug, json, stat, verbose): """ - Check the image/container (default). + Check the image/container/dockerfile (default). """ if ruleset and ruleset_file: raise click.BadOptionUsage("Options '--ruleset' and '--file-ruleset' cannot be used together.") diff --git a/colin/core/colin.py b/colin/core/colin.py index 27e50af6..5a6123ba 100644 --- a/colin/core/colin.py +++ b/colin/core/colin.py @@ -28,8 +28,9 @@ def run(target, group=None, severity=None, tags=None, ruleset_name=None, ruleset """ Runs the sanity checks for the target. - :param target: str or Image/Container (name of the container/image or Image/Container instance from conu - or path to dockerfile) + :param target: str + or Image/Container (name of the container/image or Image/Container instance from conu) + or path or file-like object for dockerfile :param group: str (name of the folder with group of checks, if None, all of them will be checked.) :param severity: str (if not None, only those checks will be run -- optional x required x warn ...) :param tags: list of str (if not None, the checks will be filtered by tags.) diff --git a/colin/core/ruleset/ruleset.py b/colin/core/ruleset/ruleset.py index 1ef8ee3c..8f9541a6 100644 --- a/colin/core/ruleset/ruleset.py +++ b/colin/core/ruleset/ruleset.py @@ -137,7 +137,7 @@ def get_checks_from_rules(rules, group, target_type, severity, tags): if tags: for t in tags: if t not in check_instance.tags: - logger.debug("Check not passed the tag control: {}".format(r)) + logger.debug("Check not passed the tag control: {}".format(t)) continue result.append(check_instance) logger.debug("Check instance {} added.".format(check_instance.name))