haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provisioners/docker: allow images to be configured with images:

This commit is contained in:
Mitchell Hashimoto 2013-12-03 14:25:20 -08:00
parent d3b7bffc65
commit c55f7dfd64
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/docker/config.rb
View File

@ -12,6 +12,10 @@ module VagrantPlugins
@version = :latest @version = :latest
end end
def images=(images)
@images = Set.new(images)
end
def pull_images(*images) def pull_images(*images)
@images += images.map(&:to_s) @images += images.map(&:to_s)
end end

1
plugins/provisioners/docker/provisioner.rb
View File

@ -12,6 +12,7 @@ module VagrantPlugins
class Provisioner < Vagrant.plugin("2", :provisioner) class Provisioner < Vagrant.plugin("2", :provisioner)
def initialize(machine, config, installer = nil, client = nil) def initialize(machine, config, installer = nil, client = nil)
super(machine, config) super(machine, config)
# TODO: Rename to installer / client (drop docker suffix) # TODO: Rename to installer / client (drop docker suffix)
@installer = installer || DockerInstaller.new(@machine, config.version) @installer = installer || DockerInstaller.new(@machine, config.version)
@client = client || DockerClient.new(@machine) @client = client || DockerClient.new(@machine)