haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

providers/docker: Unset container name if docker_run is called. Fixes #4294
This commit is contained in:
Mitchell Hashimoto 2014-08-30 22:23:25 -07:00
parent c78b46dc7b f1e730e9a1
commit 50f7c291ba
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/providers/docker/action/create.rb
View File

@ -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(" ")}")