podman: add volume support

diff --git a/cookbooks/podman/recipes/default.rb b/cookbooks/podman/recipes/default.rb
index 4c8257350f34cc659d70bbde6bb68efe44d0ff59..b29769c1f968cf1df791f873bab57b07988c509c 100644 (file)
--- a/cookbooks/podman/recipes/default.rb
+++ b/cookbooks/podman/recipes/default.rb
@@ -21,6 +21,7 @@ package %w[
   podman
   slirp4netns
   uidmap
   podman
   slirp4netns
   uidmap

+  fuse-overlayfs

 ]
 
 ruby_block "subuid-containers" do
 ]
 
 ruby_block "subuid-containers" do

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index dac8ee1c40a7a05c046e1a3d7214a044b8720aaf..5b64f780613216c9d134bf8f2fe9d59aed382ca0 100644 (file)
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -26,6 +26,7 @@ property :description, String, :required => true
 property :image, String, :required => true
 property :ports, Hash
 property :environment, Hash, :default => {}
 property :image, String, :required => true
 property :ports, Hash
 property :environment, Hash, :default => {}

+property :volume, Hash, :default => {}

 
 action :create do
   systemd_service new_resource.service do
 
 action :create do
   systemd_service new_resource.service do


@@ -34,7 +35,7 @@ action :create do
     notify_access "all"
     environment "PODMAN_SYSTEMD_UNIT" => "%n"
     exec_start_pre "/bin/rm --force %t/%n.ctr-id"
     notify_access "all"
     environment "PODMAN_SYSTEMD_UNIT" => "%n"
     exec_start_pre "/bin/rm --force %t/%n.ctr-id"

-    exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --userns=auto --label=io.containers.autoupdate=registry --pids-limit=-1 #{publish_options} #{environment_options} --rm --sdnotify=conmon --detach --replace --name=%N #{new_resource.image}"
+    exec_start "/usr/bin/podman run --cidfile=%t/%n.ctr-id --cgroups=no-conmon --userns=auto --label=io.containers.autoupdate=registry --pids-limit=-1 #{publish_options} #{environment_options} #{volume_options} --rm --sdnotify=conmon --detach --replace --name=%N #{new_resource.image}"

     exec_stop "/usr/bin/podman stop --ignore --time=10 --cidfile=%t/%n.ctr-id"
     exec_stop_post "/usr/bin/podman rm --force --ignore --cidfile=%t/%n.ctr-id"
     timeout_start_sec 180
     exec_stop "/usr/bin/podman stop --ignore --time=10 --cidfile=%t/%n.ctr-id"
     exec_stop_post "/usr/bin/podman rm --force --ignore --cidfile=%t/%n.ctr-id"
     timeout_start_sec 180


@@ -80,4 +81,10 @@ action_class do
       "-e '#{key}=#{value}'"
     end.join(" ")
   end
       "-e '#{key}=#{value}'"
     end.join(" ")
   end

+
+  def volume_options
+    new_resource.volume.collect do |key, value|
+      "-v '#{key}:#{value}'"
+    end.join(" ")
+  end

 end
 end