From 2d0ab878342ef28dc0bbe8e6b7cda8ae594d1b38 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Mon, 9 Feb 2015 11:38:31 +0100 Subject: [PATCH] don't check Docker availability if not present in test environment --- config/initializers/docker.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/initializers/docker.rb b/config/initializers/docker.rb index 09a57d06..69bb5c7d 100644 --- a/config/initializers/docker.rb +++ b/config/initializers/docker.rb @@ -1,3 +1,6 @@ -DockerClient.initialize_environment -DockerContainerPool.start_refill_task if DockerContainerPool.config[:active] -at_exit { DockerContainerPool.clean_up } unless Rails.env.test? +DockerClient.initialize_environment unless Rails.env.test? && `which docker`.blank? + +if DockerContainerPool.config[:active] + DockerContainerPool.start_refill_task + at_exit { DockerContainerPool.clean_up } +end