From 91780ac0677697f1205c98b125ffc1db4a9629f9 Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 16 Sep 2020 16:13:41 -0600 Subject: fix: correct linter errors --- lib/e2e/docker.rb | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/e2e/docker.rb b/lib/e2e/docker.rb index 8cd9fbe..a636438 100644 --- a/lib/e2e/docker.rb +++ b/lib/e2e/docker.rb @@ -14,18 +14,31 @@ class Docker def build(tag:) Dir.chdir pwd do - system("docker build --network=host -t #{tag} .") + system(expand([:docker, :build, "--network=host", "-t", tag, "."])) end end def run(image:, project_path: Pathname.pwd, env: {}, debug: ENV.fetch('DEBUG', 'false') == 'true') env_options = DEFAULT_ENV.merge(env).map { |(key, value)| "--env #{key}='#{value}'" } Dir.chdir pwd do - command = if debug - expand([:docker, :run, '-it', "--entrypoint=''", '--rm', "--volume=#{project_path}:/tmp/app", '--add-host=maven.test:127.0.0.1', '--network=host', env_options, image, '/bin/bash -l']) - else - expand([:docker, :run, '--rm', "--volume=#{project_path}:/tmp/app", '--network=host', '--add-host=maven.test:127.0.0.1', env_options, image, '/analyzer run']) - end + command = + if debug + expand([ + :docker, :run, '-it', "--entrypoint=''", '--rm', + "--volume=#{project_path}:/tmp/app", + '--add-host=maven.test:127.0.0.1', + '--network=host', + env_options, image, '/bin/bash -l' + ]) + else + expand([ + :docker, :run, '--rm', + "--volume=#{project_path}:/tmp/app", + '--network=host', + '--add-host=maven.test:127.0.0.1', + env_options, image, '/analyzer run' + ]) + end system(command, exception: true) end end -- cgit v1.2.3