Merge pull request #2641 from arthurnn/docker_rename
Rename docker_client and docker_installer
This commit is contained in:
commit
e70a6e2563
|
@ -2,7 +2,7 @@ require 'digest/sha1'
|
|||
|
||||
module VagrantPlugins
|
||||
module Docker
|
||||
class DockerClient
|
||||
class Client
|
||||
def initialize(machine)
|
||||
@machine = machine
|
||||
end
|
|
@ -1,6 +1,6 @@
|
|||
module VagrantPlugins
|
||||
module Docker
|
||||
class DockerInstaller
|
||||
class Installer
|
||||
def initialize(machine, version)
|
||||
@machine = machine
|
||||
@version = version
|
|
@ -1,5 +1,5 @@
|
|||
require_relative "docker_client"
|
||||
require_relative "docker_installer"
|
||||
require_relative "client"
|
||||
require_relative "installer"
|
||||
|
||||
module VagrantPlugins
|
||||
module Docker
|
||||
|
@ -13,9 +13,8 @@ module VagrantPlugins
|
|||
def initialize(machine, config, installer = nil, client = nil)
|
||||
super(machine, config)
|
||||
|
||||
# TODO: Rename to installer / client (drop docker suffix)
|
||||
@installer = installer || DockerInstaller.new(@machine, config.version)
|
||||
@client = client || DockerClient.new(@machine)
|
||||
@installer = installer || Installer.new(@machine, config.version)
|
||||
@client = client || Client.new(@machine)
|
||||
end
|
||||
|
||||
def provision
|
||||
|
|
Loading…
Reference in New Issue