1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #487 from brunoqc/patch-2

* vagrant: Use only one deb line in /etc/apt
This commit is contained in:
Guillaume J. Charmes 2013-05-03 11:55:16 -07:00
commit 19df5a7965

2
Vagrantfile vendored
View file

@ -11,7 +11,7 @@ Vagrant::Config.run do |config|
config.vm.box_url = BOX_URI config.vm.box_url = BOX_URI
# Add docker PPA key to the local repository and install docker # Add docker PPA key to the local repository and install docker
pkg_cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys #{PPA_KEY}; " pkg_cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys #{PPA_KEY}; "
pkg_cmd << "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' >>/etc/apt/sources.list; " pkg_cmd << "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' >/etc/apt/sources.list.d/lxc-docker.list; "
pkg_cmd << "apt-get update -qq; apt-get install -q -y lxc-docker" pkg_cmd << "apt-get update -qq; apt-get install -q -y lxc-docker"
if ARGV.include?("--provider=aws".downcase) if ARGV.include?("--provider=aws".downcase)
# Add AUFS dependency to amazon's VM # Add AUFS dependency to amazon's VM