Explicitly set key and keyserver, so we don't make a request to get.d…

…ocker.io on every chef run.
sous-chefs · Oct 28, 2014 · 1976289 · 1976289
1 parent 383cc5f
commit 1976289
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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