lib/docker-provider/action/create.rb in docker-provider-0.0.2 vs lib/docker-provider/action/create.rb in docker-provider-0.1.0

- old
+ new

@@ -1,21 +1,23 @@ module VagrantPlugins module DockerProvider module Action class Create def initialize(app, env) - @app = app + @app = app @@mutex ||= Mutex.new end def call(env) @env = env @machine = env[:machine] @provider_config = @machine.provider_config @machine_config = @machine.config @driver = @machine.provider.driver + guard_cmd_configured! + cid = '' @@mutex.synchronize do cid = @driver.create(create_params) end @@ -27,29 +29,30 @@ container_name = "#{@env[:root_path].basename.to_s}_#{@machine.name}" container_name.gsub!(/[^-a-z0-9_]/i, "") container_name << "_#{Time.now.to_i}" { - image: @provider_config.image, - cmd: @provider_config.cmd, - ports: forwarded_ports, - name: container_name, - hostname: @machine_config.vm.hostname, - volumes: synced_folders + image: @provider_config.image, + cmd: @provider_config.cmd, + ports: forwarded_ports, + name: container_name, + hostname: @machine_config.vm.hostname, + volumes: @provider_config.volumes, + privileged: @provider_config.privileged } end def forwarded_ports @env[:forwarded_ports].map do |fp| # TODO: Support for the protocol argument "#{fp[:host]}:#{fp[:guest]}" end.compact end - def synced_folders - @env[:synced_folders].map do |sf| - "#{sf[:hostpath]}:#{sf[:guestpath]}" - end.compact + def guard_cmd_configured! + if ! @provider_config.image + raise Errors::ImageNotConfiguredError, name: @machine.name + end end end end end end