Skip to content

Commit

Permalink
Correct docs
Browse files Browse the repository at this point in the history
Signed-off-by: lachmanfrantisek <[email protected]>
  • Loading branch information
lachmanfrantisek committed Apr 16, 2018
1 parent dd18945 commit 2e1a08d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion colin/cli/colin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
5 changes: 3 additions & 2 deletions colin/core/colin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
2 changes: 1 addition & 1 deletion colin/core/ruleset/ruleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 2e1a08d

Please sign in to comment.