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

provisioners/docker: get GPG key via SSL [GH-4597]

This commit is contained in:
Mitchell Hashimoto 2014-10-23 09:34:24 -07:00
parent 29df3c733b
commit abb9e5478a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -39,6 +39,7 @@ BUG FIXES:
clean up an existing VM. [GH-4681] clean up an existing VM. [GH-4681]
- providers/virtualbox: Detect case when VirtualBox reports 0.0.0.0 as - providers/virtualbox: Detect case when VirtualBox reports 0.0.0.0 as
IP address and don't allow it. [GH-4671] IP address and don't allow it. [GH-4671]
- provisioners/docker: Get GPG key over SSL. [GH-4597]
- provisioners/docker: Search for docker binary in multiple places. [GH-4580] - provisioners/docker: Search for docker binary in multiple places. [GH-4580]
- provisioners/salt: Highstate works properly with a master. [GH-4471] - provisioners/salt: Highstate works properly with a master. [GH-4471]
- synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619] - synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619]

2
plugins/provisioners/docker/cap/debian/docker_install.rb
View File

@ -14,7 +14,7 @@ module VagrantPlugins
end end
comm.sudo("apt-get update -y") comm.sudo("apt-get update -y")
comm.sudo("apt-get install -y --force-yes -q curl") comm.sudo("apt-get install -y --force-yes -q curl")
comm.sudo("curl https://get.docker.io/gpg | apt-key add -") comm.sudo("curl -sSL https://get.docker.io/gpg | apt-key add -")
comm.sudo("echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list") comm.sudo("echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
comm.sudo("apt-get update") comm.sudo("apt-get update")
comm.sudo("echo lxc lxc/directory string /var/lib/lxc | debconf-set-selections") comm.sudo("echo lxc lxc/directory string /var/lib/lxc | debconf-set-selections")