From dda7cbb412b2228aaad019b053c1fbc46f42dff4 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 3 Dec 2013 14:18:30 -0800 Subject: [PATCH] provisioners/docker: make sure version is correct type, fix Ruby warning --- plugins/provisioners/docker/config.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/provisioners/docker/config.rb b/plugins/provisioners/docker/config.rb index 3845cab2f..f90335835 100644 --- a/plugins/provisioners/docker/config.rb +++ b/plugins/provisioners/docker/config.rb @@ -34,9 +34,13 @@ module VagrantPlugins @containers[container_name.to_s] = params end + def finalize! + @version = @version.to_sym + end + def merge(other) super.tap do |result| - result.pull_images *(other.images + self.images) + result.pull_images(*(other.images + self.images)) end end end