X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a5da0ffea6e87b6154543e46dcca79a191672265..2885d021365be5a425432c529b14bfe1a14891b8:/cookbooks/podman/resources/service.rb?ds=inline

diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb
index b48e04ce1..5ef0b5885 100644
--- a/cookbooks/podman/resources/service.rb
+++ b/cookbooks/podman/resources/service.rb
@@ -24,7 +24,9 @@ default_action :create
 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 :volume, Hash, :default => {}
 
 action :create do
   systemd_service new_resource.service do
@@ -33,7 +35,7 @@ action :create do
     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 --network=slirp4netns:mtu=1500 #{publish_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
@@ -73,4 +75,16 @@ action_class do
       "--publish=127.0.0.1:#{host}:#{guest}"
     end.join(" ")
   end
+
+  def environment_options
+    new_resource.environment.collect do |key, value|
+      "-e '#{key}=#{value}'"
+    end.join(" ")
+  end
+
+  def volume_options
+    new_resource.volume.collect do |key, value|
+      "-v '#{key}:#{value}'"
+    end.join(" ")
+  end
 end