summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-09-16 16:20:29 -0600
committermo khan <mo.khan@gmail.com>2020-09-16 16:20:29 -0600
commit2bece2065c170e6ef056d04b7797b26dc208006e (patch)
tree099fc5227ca53261548a394d8cd18fdf499fa376
parent91780ac0677697f1205c98b125ffc1db4a9629f9 (diff)
refactor: collapse conditional
-rw-r--r--lib/e2e/docker.rb27
1 files changed, 9 insertions, 18 deletions
diff --git a/lib/e2e/docker.rb b/lib/e2e/docker.rb
index a636438..56f8964 100644
--- a/lib/e2e/docker.rb
+++ b/lib/e2e/docker.rb
@@ -21,24 +21,15 @@ class Docker
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
+ arguments = [
+ :docker, :run, '--rm',
+ "--volume=#{project_path}:/tmp/app",
+ '--network=host',
+ '--add-host=maven.test:127.0.0.1',
+ env_options
+ ]
+ arguments.push(debug ? ["-it", "--entrypoint=''", image, '/bin/bash -l'] : [image, '/analyzer run'])
+ command = expand(arguments)
system(command, exception: true)
end
end