Add geodns role to balerion

[chef.git] / cookbooks / docker / recipes / default.rb

diff --git a/cookbooks/docker/recipes/default.rb b/cookbooks/docker/recipes/default.rb
index fd3773634be177b2881d9e21e53dd7fe731207e0..54d65dfe588c098deb62cc34c3959a8b82c60d34 100644 (file)
--- a/cookbooks/docker/recipes/default.rb
+++ b/cookbooks/docker/recipes/default.rb
@@ -17,14 +17,20 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"
+

 package %w[
 package %w[

-  apt-transport-https
-  ca-certificates
-  curl
-  software-properties-common
-  gnupg2
+  docker-ce
+  docker-ce-cli
+  containerd.io

 ]
 
 ]
 

+directory "/etc/docker" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
+

 template "/etc/docker/daemon.json" do
   source "daemon.json.erb"
   owner "root"
 template "/etc/docker/daemon.json" do
   source "daemon.json.erb"
   owner "root"


@@ -32,13 +38,8 @@ template "/etc/docker/daemon.json" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-package %w[
-  docker-ce
-  docker-ce-cli
-  containerd.io
-]
-

 service "docker" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/docker/daemon.json]"
 service "docker" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/docker/daemon.json]"

+  not_if { ENV["TEST_KITCHEN"] }

 end
 end