Commit 50f7c291 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto
Browse files

Merge pull request #4417 from rclanan/fix/master/4294-docker-named-conflicts

providers/docker: Unset container name if docker_run is called. Fixes #4294
parents c78b46dc f1e730e9
Showing with 8 additions and 1 deletion
+8 -1
......@@ -32,12 +32,19 @@ module VagrantPlugins
# Remove container after execution
params[:rm] = true if env[:run_rm]
# Name should not be used with run_command
params[:name] = UNSET_VALUE
# We link to our original container
# TODO
end
env[:ui].output(I18n.t("docker_provider.creating"))
env[:ui].detail(" Name: #{params[:name]}")
if params[:name] != UNSET_VALUE
env[:ui].detail(" Name: #{params[:name]}")
end
env[:ui].detail(" Image: #{params[:image]}")
if params[:cmd] && !params[:cmd].empty?
env[:ui].detail(" Cmd: #{params[:cmd].join(" ")}")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment