podman: do not require port

[chef.git] / cookbooks / podman / resources / service.rb

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index dac8ee1c40a7a05c046e1a3d7214a044b8720aaf..5ef0b5885f2d90476fc75103ed86572ae2d32d97 100644 (file)
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -24,8 +24,9 @@ default_action :create
 property :service, String, :name_property => true
 property :description, String, :required => true
 property :image, String, :required => true
 property :service, String, :name_property => true
 property :description, String, :required => true
 property :image, String, :required => true

-property :ports, Hash
+property :ports, Hash, :default => {}

 property :environment, Hash, :default => {}
 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