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

Merge pull request #7086 from kamigerami/fixes-7074-does-not-allow-provisioning-when-container-name-is-specified 

#7074 - fixes does not allow provisioning when container name is specified
This commit is contained in:
Seth Vargo 2016-02-29 07:15:01 -05:00
parent c851637260 fc6bc723f7
commit 0aa3db0fe5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/provisioners/docker/client.rb
View File

@ -126,9 +126,8 @@ module VagrantPlugins
@machine.communicate.tap do |comm|
# Docker < 0.7.0 stores container IDs using its short version while
# recent versions use the full container ID
# See https://github.com/dotcloud/docker/pull/2140 for more information
return comm.test("#{docker_ps} | grep -wFq #{id}") ||
comm.test("#{docker_ps} --no-trunc | grep -wFq #{id}")
# using full container ID from now on.
return comm.test("#{docker_ps} --no-trunc | grep -wFq #{id}")
end
end