Drop old cleanup code

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

diff --git a/cookbooks/docker/recipes/default.rb b/cookbooks/docker/recipes/default.rb
index 3d7fd2104ebf8bcb1661b12ebaeb43af31591f5e..1c8643d03a3fb331fa97a09c0f8d00b91cfee2db 100644 (file)
--- a/cookbooks/docker/recipes/default.rb
+++ b/cookbooks/docker/recipes/default.rb
@@ -23,6 +23,7 @@ package %w[
   docker-ce
   docker-ce-cli
   containerd.io
   docker-ce
   docker-ce-cli
   containerd.io

+  docker-compose-plugin

 ]
 
 directory "/etc/docker" do
 ]
 
 directory "/etc/docker" do


@@ -38,6 +39,11 @@ template "/etc/docker/daemon.json" do
   mode "644"
 end
 
   mode "644"
 end
 

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

 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]"


@@ -60,3 +66,7 @@ systemd_timer "docker-system-prune" do
   on_unit_active_sec "7d"
   randomized_delay_sec "4h"
 end
   on_unit_active_sec "7d"
   randomized_delay_sec "4h"
 end

+
+service "docker-system-prune.timer" do
+  action [:enable, :start]
+end