diff options
| -rw-r--r-- | lib/e2e/docker.rb | 10 | ||||
| -rw-r--r-- | spec/integration/klar_spec.rb | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/e2e/docker.rb b/lib/e2e/docker.rb index 4f5e788..4ae530a 100644 --- a/lib/e2e/docker.rb +++ b/lib/e2e/docker.rb @@ -19,7 +19,13 @@ class Docker end end - def run(image:, project_path: Pathname.pwd, env: {}, debug: ENV.fetch('DEBUG', 'false') == 'true', command: '/analyzer run') + def run( + image:, + project_path: Pathname.pwd, + env: {}, + debug: ENV.fetch('DEBUG', 'false') == 'true', + command: '/analyzer run' + ) env_options = DEFAULT_ENV.merge(env).map { |(key, value)| "--env #{key}='#{value}'" } Dir.chdir pwd do arguments = [ @@ -29,7 +35,7 @@ class Docker "--network=host", "--volume=#{project_path}:/tmp/app", "--workdir=/tmp/app", - env_options, + env_options ] arguments.push("--add-host=clair-vulnerabilities-db:127.0.0.1") unless ENV['CI'] arguments.push(debug ? ["-it", image] : [image]) diff --git a/spec/integration/klar_spec.rb b/spec/integration/klar_spec.rb index 627ca9d..91c8b7f 100644 --- a/spec/integration/klar_spec.rb +++ b/spec/integration/klar_spec.rb @@ -8,7 +8,7 @@ RSpec.describe 'klar' do let(:env) do { DOCKERFILE_PATH: project.path.join("minbox-Dockerfile"), - DOCKER_IMAGE: "mokhan/minbox:latest", + DOCKER_IMAGE: "mokhan/minbox:latest" } end @@ -25,7 +25,7 @@ RSpec.describe 'klar' do let(:env) do { DOCKERFILE_PATH: project.path.join("centos8-Dockerfile"), - DOCKER_IMAGE: "centos:8", + DOCKER_IMAGE: "centos:8" } end |