locate configuration file before we run the tests

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
This commit is contained in:
Thomas Sjögren 2019-12-17 15:03:54 +01:00
parent 19173cb954
commit 269b71eed8
3 changed files with 11 additions and 3 deletions

View file

@ -150,7 +150,7 @@ check_2_6() {
starttestjson "$id_2_6" "$desc_2_6"
totalChecks=$((totalChecks + 1))
if grep -qi 'tcp://' "$CONFIG_FILE" || \
if [ $(get_docker_configuration_file_args 'tcp://') ] || \
[ $(get_docker_cumulative_command_line_args '-H' | grep -vE '(unix|fd)://') >/dev/null 2>&1 ]; then
if [ $(get_docker_configuration_file_args '"tlsverify":' | grep 'true') ] || \
[ $(get_docker_cumulative_command_line_args '--tlsverify' | grep 'tlsverify') >/dev/null 2>&1 ]; then