From 3289141fc3f2a8439b999e382b33c788d716a35f Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Fri, 29 Nov 2013 01:26:35 -0200 Subject: [PATCH] provisioners/docker: Clean up some leftovers from vocker --- plugins/provisioners/docker/docker_client.rb | 2 +- plugins/provisioners/docker/docker_installer.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/provisioners/docker/docker_client.rb b/plugins/provisioners/docker/docker_client.rb index 923a7dc9a..895d21ce1 100644 --- a/plugins/provisioners/docker/docker_client.rb +++ b/plugins/provisioners/docker/docker_client.rb @@ -27,7 +27,7 @@ module VagrantPlugins def run(containers) containers.each do |name, config| - cids_dir = "/var/lib/vocker/cids" + cids_dir = "/var/lib/vagrant/cids" config[:cidfile] ||= "#{cids_dir}/#{Digest::SHA1.hexdigest name}" @machine.communicate.sudo("mkdir -p #{cids_dir}") diff --git a/plugins/provisioners/docker/docker_installer.rb b/plugins/provisioners/docker/docker_installer.rb index 974f2b6d6..3cf444f41 100644 --- a/plugins/provisioners/docker/docker_installer.rb +++ b/plugins/provisioners/docker/docker_installer.rb @@ -1,5 +1,3 @@ -require_relative "errors" - module VagrantPlugins module Docker class DockerInstaller