From 2cbfd83f539a366936d905ce2aab7e4dba99502a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?=
 <konstruktoid@users.noreply.github.com>
Date: Thu, 25 Oct 2018 11:34:14 +0200
Subject: [PATCH 1/2] add nocolor option #321
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
---
 docker-bench-security.sh | 14 ++++++++------
 output_lib.sh            | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/docker-bench-security.sh b/docker-bench-security.sh
index d50aaa2..08e59b6 100755
--- a/docker-bench-security.sh
+++ b/docker-bench-security.sh
@@ -9,11 +9,6 @@
 
 version='1.3.4'
 
-# Load dependencies
-. ./functions_lib.sh
-. ./helper_lib.sh
-. ./output_lib.sh
-
 # Setup the paths
 this_path=$(abspath "$0")       ## Path of this file including filename
 myname=$(basename "${this_path}")     ## file name of this script.
@@ -40,6 +35,7 @@ usage () {
   cat <<EOF
   usage: ${myname} [options]
 
+  -b           optional  Do not print colors
   -h           optional  Print this help message
   -l FILE      optional  Log output in FILE
   -c CHECK     optional  Comma delimited list of specific check(s)
@@ -52,9 +48,10 @@ EOF
 # Get the flags
 # If you add an option here, please
 # remember to update usage() above.
-while getopts hl:c:e:i:x: args
+while getopts bhl:c:e:i:x: args
 do
   case $args in
+  b) nocolor="nocolor";;
   h) usage; exit 0 ;;
   l) logger="$OPTARG" ;;
   c) check="$OPTARG" ;;
@@ -69,6 +66,11 @@ if [ -z "$logger" ]; then
   logger="${myname}.log"
 fi
 
+# Load dependencies
+. ./functions_lib.sh
+. ./helper_lib.sh
+. ./output_lib.sh
+
 yell_info
 
 # Warn if not root
diff --git a/output_lib.sh b/output_lib.sh
index 3bb7ce8..c0de4e4 100644
--- a/output_lib.sh
+++ b/output_lib.sh
@@ -1,9 +1,18 @@
 #!/bin/sh
-bldred='\033[1;31m'
-bldgrn='\033[1;32m'
-bldblu='\033[1;34m'
-bldylw='\033[1;33m' # Yellow
-txtrst='\033[0m'
+
+if ! [ -z "$nocolor" ] && [ "$nocolor" = "nocolor" ]; then
+  bldred=''
+  bldgrn=''
+  bldblu=''
+  bldylw=''
+  txtrst=''
+else
+  bldred='\033[1;31m'
+  bldgrn='\033[1;32m'
+  bldblu='\033[1;34m'
+  bldylw='\033[1;33m' # Yellow
+  txtrst='\033[0m'
+fi
 
 logit () {
   printf "%b\n" "$1" | tee -a "$logger"

From 1647e4797601222e6eb5b630b61c6768277f8728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?=
 <konstruktoid@users.noreply.github.com>
Date: Thu, 25 Oct 2018 11:39:35 +0200
Subject: [PATCH 2/2] update README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 52bad84..8d0d68e 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,12 @@ version 1.13.0 or later.
 ### Docker Bench for Security options
 
 ```sh
+  -b           optional  Do not print colors
   -h           optional  Print this help message
   -l FILE      optional  Log output in FILE
   -c CHECK     optional  Comma delimited list of specific check(s)
   -e CHECK     optional  Comma delimited list of specific check(s) to exclude
+  -i INCLUDE   optional  Comma delimited list of patterns within a container name to check
   -x EXCLUDE   optional  Comma delimited list of patterns within a container name to exclude from check
 ```