From 754e0ed02bc9b7175890e7d5a7f25b6bc162314d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 21 Mar 2017 16:17:08 +0100 Subject: [PATCH] tlsverify implies tls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- tests/2_docker_daemon_configuration.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/2_docker_daemon_configuration.sh b/tests/2_docker_daemon_configuration.sh index bda5ebe..74e38e9 100644 --- a/tests/2_docker_daemon_configuration.sh +++ b/tests/2_docker_daemon_configuration.sh @@ -68,7 +68,8 @@ fi # 2.6 check_2_6="2.6 - Configure TLS authentication for Docker daemon" if grep -i 'tcp://' "$CONFIG_FILE" 2>/dev/null 1>&2; then - if get_docker_configuration_file_args '"tls":' | grep 'true' 2>/dev/null 1>&2; then + if [ $(get_docker_configuration_file_args '"tls":' | grep 'true') ] || \ + [ $(get_docker_configuration_file_args '"tlsverify' | grep 'true') ] ; then if get_docker_configuration_file_args 'tlskey' | grep -v '""' >/dev/null 2>&1; then if get_docker_configuration_file_args 'tlsverify' | grep 'true' >/dev/null 2>&1; then pass "$check_2_6"