From 1976289c94d837834c1362e3897ec6f617ec9a04 Mon Sep 17 00:00:00 2001
From: Seth Rosenblum <seth@datadoghq.com>
Date: Mon, 27 Oct 2014 13:40:15 -0400
Subject: [PATCH] Explicitly set key and keyserver, so we don't make a request
 to get.docker.io on every chef run.

---
 attributes/default.rb | 4 +++-
 recipes/package.rb    | 1 +
 spec/package_spec.rb  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 7bf60badbd..07201dc5c3 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -105,7 +105,9 @@
   },
   'default' => nil
 )
-default['docker']['package']['repo_key'] = 'https://get.docker.io/gpg'
+default['docker']['package']['repo_keyserver'] = 'keyserver.ubuntu.com'
+# Found at https://get.docker.io/ubuntu/
+default['docker']['package']['repo_key'] = 'A88D21E9'
 
 ## Source installation attributes
 
diff --git a/recipes/package.rb b/recipes/package.rb
index c748fb1511..f0a7519d61 100644
--- a/recipes/package.rb
+++ b/recipes/package.rb
@@ -18,6 +18,7 @@
       uri node['docker']['package']['repo_url']
       distribution node['docker']['package']['distribution']
       components ['main']
+      keyserver node['docker']['package']['repo_keyserver']
       key node['docker']['package']['repo_key']
     end
   end
diff --git a/spec/package_spec.rb b/spec/package_spec.rb
index e1773a8701..1e22e9d1da 100644
--- a/spec/package_spec.rb
+++ b/spec/package_spec.rb
@@ -16,7 +16,8 @@
       uri: 'https://get.docker.io/ubuntu',
       distribution: 'docker',
       components: ['main'],
-      key: 'https://get.docker.io/gpg'
+      keyserver: 'keyserver.ubuntu.com',
+      key: 'A88D21E9'
     )
   end