Packages: pin docker version to 1.12.6 due to kubernetes/kubernetes#4…

…0182
evilmartians · Jan 26, 2017 · ccf15d1 · ccf15d1
1 parent 4d21379
commit ccf15d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/attributes/docker.rb b/attributes/docker.rb
@@ -1,2 +1,3 @@
-default['docker']['storage-driver'] = 'overlay2'
-default['docker']['live-restore']   = true
+default['docker']['version']                    = '1.12.6-0'
+default['docker']['settings']['storage-driver'] = 'overlay2'
+default['docker']['settings']['live-restore']   = true
diff --git a/recipes/packages.rb b/recipes/packages.rb
@@ -19,8 +19,12 @@
   owner 'root'
   group 'root'
   mode '0644'
-  content(node['docker'].to_json)
-  not_if { node['platform_version'].to_f < 16.04 }
+  content(node['docker']['settings'].to_json)
+end
+
+apt_preference 'docker-engine' do
+  pin          "version #{node['docker']['version']}~#{node['platform']}-#{node['lsb']['codename']}"
+  pin_priority '700'
 end
 
 package 'docker-engine' do