providers/docker: smarter about setting ID to nil for machine
This commit is contained in:
parent
d526dd54fe
commit
b26ecb0150
|
@ -143,6 +143,7 @@ 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,9 +7,10 @@ module VagrantPlugins
|
|||
end
|
||||
|
||||
def call(env)
|
||||
env[:ui].info I18n.t("docker_provider.messages.destroying")
|
||||
|
||||
machine = env[:machine]
|
||||
|
||||
# If the container actually exists, destroy it
|
||||
if machine.state.id != :not_created
|
||||
driver = machine.provider.driver
|
||||
|
||||
# If we have a build image, store that
|
||||
|
@ -20,7 +21,11 @@ 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)
|
||||
|
|
Loading…
Reference in New Issue