providers/docker: less hack way to clear ID if not created
This commit is contained in:
parent
b26ecb0150
commit
ff2f035f27
|
@ -143,7 +143,6 @@ module VagrantPlugins
|
|||
b.use Call, IsState, :not_created do |env, b2|
|
||||
if env[:result]
|
||||
b2.use Message, I18n.t("docker_provider.messages.not_created")
|
||||
b2.use Destroy
|
||||
next
|
||||
end
|
||||
|
||||
|
|
|
@ -7,10 +7,9 @@ module VagrantPlugins
|
|||
end
|
||||
|
||||
def call(env)
|
||||
machine = env[:machine]
|
||||
env[:ui].info I18n.t("docker_provider.messages.destroying")
|
||||
|
||||
# If the container actually exists, destroy it
|
||||
if machine.state.id != :not_created
|
||||
machine = env[:machine]
|
||||
driver = machine.provider.driver
|
||||
|
||||
# If we have a build image, store that
|
||||
|
@ -21,11 +20,7 @@ module VagrantPlugins
|
|||
end
|
||||
env[:build_image] = image
|
||||
|
||||
env[:ui].info I18n.t("docker_provider.messages.destroying")
|
||||
driver.rm(machine.id)
|
||||
end
|
||||
|
||||
# Otherwise, always make sure we remove the ID
|
||||
machine.id = nil
|
||||
|
||||
@app.call(env)
|
||||
|
|
|
@ -146,6 +146,9 @@ module VagrantPlugins
|
|||
state_id = driver.state(@machine.id) if @machine.id && !state_id
|
||||
state_id = :unknown if !state_id
|
||||
|
||||
# If the machine is not created, make sure to clear out machine ID
|
||||
@machine.id = nil if state_id == :not_created
|
||||
|
||||
short = state_id.to_s.gsub("_", " ")
|
||||
long = I18n.t("docker_provider.status.#{state_id}")
|
||||
|
||||
|
|
Loading…
Reference in New Issue