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

Merge pull request #7085 from kamigerami/fixes-7084-notrunc-command-is-wrong-in-client.rb 

#7084 - fixes-7084-notrunc-command-is-wrong-in-client.rb : corrected …
This commit is contained in:
Seth Vargo 2016-02-27 12:41:01 -05:00
parent 00dbcbdc3e 6754f8db14
commit 809b99b773
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ module VagrantPlugins
# recent versions use the full container ID # recent versions use the full container ID
# See https://github.com/dotcloud/docker/pull/2140 for more information # See https://github.com/dotcloud/docker/pull/2140 for more information
return comm.test("#{docker_ps} | grep -wFq #{id}") || return comm.test("#{docker_ps} | grep -wFq #{id}") ||
comm.test("#{docker_ps} -notrunc | grep -wFq #{id}") comm.test("#{docker_ps} --no-trunc | grep -wFq #{id}")
end end
end end