X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/31f1fa863c0b208a44e10ef3ae1571024ef0f0ae..137c1558a1a89a99b4770ffa1f4b71fc46eb0020:/cookbooks/podman/resources/service.rb diff --git a/cookbooks/podman/resources/service.rb b/cookbooks/podman/resources/service.rb index dac8ee1c4..5ef0b5885 100644 --- 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 :ports, Hash +property :ports, Hash, :default => {} property :environment, Hash, :default => {} +property :volume, Hash, :default => {} 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" - 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 @@ -80,4 +81,10 @@ action_class do "-e '#{key}=#{value}'" end.join(" ") end + + def volume_options + new_resource.volume.collect do |key, value| + "-v '#{key}:#{value}'" + end.join(" ") + end end