From abb9e5478a3b0a645fb369ecf80a9a38ee29edd2 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 23 Oct 2014 09:34:24 -0700 Subject: [PATCH] provisioners/docker: get GPG key via SSL [GH-4597] --- CHANGELOG.md | 1 + plugins/provisioners/docker/cap/debian/docker_install.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c67de7b..422c5be06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ BUG FIXES: clean up an existing VM. [GH-4681] - providers/virtualbox: Detect case when VirtualBox reports 0.0.0.0 as 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/salt: Highstate works properly with a master. [GH-4471] - synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619] diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb index 866eb391f..5db0f12ba 100644 --- a/plugins/provisioners/docker/cap/debian/docker_install.rb +++ b/plugins/provisioners/docker/cap/debian/docker_install.rb @@ -14,7 +14,7 @@ module VagrantPlugins end comm.sudo("apt-get update -y") 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("apt-get update") comm.sudo("echo lxc lxc/directory string /var/lib/lxc | debconf-set-selections")