nominatim: also download us postcode data

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

diff --git a/cookbooks/docker/recipes/default.rb b/cookbooks/docker/recipes/default.rb
index fd3773634be177b2881d9e21e53dd7fe731207e0..23891f110c3e59c82fb960b995e7e8667cf9f7fc 100644 (file)
--- a/cookbooks/docker/recipes/default.rb
+++ b/cookbooks/docker/recipes/default.rb
@@ -17,28 +17,29 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+
 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 "755"
+end
+
 template "/etc/docker/daemon.json" do
   source "daemon.json.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
-package %w[
-  docker-ce
-  docker-ce-cli
-  containerd.io
-]
-
 service "docker" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/docker/daemon.json]"
+  not_if { ENV["TEST_KITCHEN"] }
 end