From d8370865722f0fa5a2cc033cb4c95eaef34b095a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 20 Apr 2014 08:17:19 -0700 Subject: [PATCH] providers/docker: get rid of mutex around Docker access, should be safe --- plugins/providers/docker/action/create.rb | 30 ++++++++++------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/plugins/providers/docker/action/create.rb b/plugins/providers/docker/action/create.rb index 0675cb770..f49fce568 100644 --- a/plugins/providers/docker/action/create.rb +++ b/plugins/providers/docker/action/create.rb @@ -4,7 +4,6 @@ module VagrantPlugins class Create def initialize(app, env) @app = app - @@mutex ||= Mutex.new end def call(env) @@ -18,23 +17,20 @@ module VagrantPlugins params = create_params - cid = '' - @@mutex.synchronize do - env[:ui].output(I18n.t("docker_provider.creating")) - env[:ui].detail(" Name: #{params[:name]}") - env[:ui].detail(" Image: #{params[:image]}") - params[:volumes].each do |volume| - env[:ui].detail("Volume: #{volume}") - end - params[:ports].each do |pair| - env[:ui].detail(" Port: #{pair}") - end - params[:links].each do |name, other| - env[:ui].detail(" Link: #{name}:#{other}") - end - - cid = @driver.create(params) + env[:ui].output(I18n.t("docker_provider.creating")) + env[:ui].detail(" Name: #{params[:name]}") + env[:ui].detail(" Image: #{params[:image]}") + params[:volumes].each do |volume| + env[:ui].detail("Volume: #{volume}") end + params[:ports].each do |pair| + env[:ui].detail(" Port: #{pair}") + end + params[:links].each do |name, other| + env[:ui].detail(" Link: #{name}:#{other}") + end + + cid = @driver.create(params) env[:ui].detail(" \n"+I18n.t( "docker_provider.created", id: cid[0...16]))