From fc6bc723f7ab54c689116853bcb150decc3d8668 Mon Sep 17 00:00:00 2001 From: Kamjar Gerami Date: Sun, 28 Feb 2016 13:00:35 +0100 Subject: [PATCH] #7074 - fixes does not allow provisioning when container name is specifed - since recent versions of Docker stores it's full container ID we no longer need to use the short version --- plugins/provisioners/docker/client.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/provisioners/docker/client.rb b/plugins/provisioners/docker/client.rb index 3a42b260c..cb1e577ea 100644 --- a/plugins/provisioners/docker/client.rb +++ b/plugins/provisioners/docker/client.rb @@ -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