Service works

Author: alvagante

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "cidfile"
+  ]
+}

manifests/install/package.pp

@@ -332,8 +332,16 @@
           require => $service_require,
         }
         $services.each |$kk,$vv| {
-          service { $kk:
-            * => $service_defaults + pick(getvar("settings.services.${kk}.params"), getvar('settings.service_params'), {}),
+          if $vv['name'] != '' and $vv['manage'] != false {
+            if $kk == 'main' {
+              $service_title = $app
+            } else {
+              $service_title = $kk
+            }
+            $service_params = pick(getvar("settings.services.${kk}.params"), getvar('settings.service_params'), {})
+            service { $service_title:
+              * => $service_defaults + { name => pick($vv['name'],$service_title) } + $service_params,
+            }
           }
         }
       }

manifests/service.pp

@@ -92,7 +92,7 @@
           undef: {
             $mount_mapping = getvar('settings.dirs') ? {
               undef   => '',
-              default => join(getvar('settings.dirs').map |$k,$v| { if getvar('v.path') { "-v ${v['path']}:${v['path']}" } }, ' '),
+              default => join(getvar('settings.dirs').map |$k,$v| { if getvar('v.path') { if getvar('os.selinux.enabled') { "-v ${v['path']}:${v['path']}:Z" } else { "-v ${v['path']}:${v['path']}" } } }, ' '), # lint:ignore:140chars
             }
           }
           String[0]: {
@@ -102,17 +102,22 @@
             $mount_mapping = "-v ${settings['image']['mounts']}"
           }
           Array: {
-            $mount_mapping = join(getvar('settings.image.mounts').map|$k| { "-v ${k}" }, ' ')
+            $mount_mapping = join(getvar('settings.image.mounts').map|$k| { if getvar('os.selinux.enabled') { "-v ${k}:${k}:Z" } else { "-v ${k}:${k}" } }, ' ') # lint:ignore:140chars
           }
           Hash: {
-            $mount_mapping = join(getvar('settings.image.mounts').map |$k,$v| { "-v ${k}:${v}" }, ' ')
+            $mount_mapping = join(getvar('settings.image.mounts').map |$k,$v| { if getvar('v.path') { if getvar('os.selinux.enabled') { "-v ${v['path']}:${v['path']}:Z" } else { "-v ${v['path']}:${v['path']}" } } }, ' ') # lint:ignore:140chars
           }
           default: {
             tp::fail($on_missing_data, "tp::service ${app} - settings.image.mounts is not a valid type")
           }
         }
 
         $docker_args = pick_default(getvar('settings.docker.args'),'')
+        $cidfile = '%t/%n.ctr-id'
+        $docker_command = $facts['os']['family'] ? {
+          'RedHat' => '/usr/bin/podman',
+          default  => '/usr/bin/docker',
+        }
         $docker_after = $facts['os']['family'] ? {
           'RedHat' => 'network-online.target',
           default  => 'docker.service',
@@ -129,10 +134,12 @@
             'Requires'      => $docker_requires,
           },
           'Service' => {
-#            'ExecStartPre' => "/usr/bin/docker stop ${app} ; /usr/bin/docker rm ${app} ; /usr/bin/docker pull ${settings['docker_image']}",
-            'ExecStart'    => "/usr/bin/docker run --rm --name ${app} ${docker_args} ${port_mapping} ${mount_mapping} ${docker_image}",
+            'ExecStartPre' => "/bin/rm -f ${cidfile}",
+            'ExecStart'    => "${docker_command} run --rm --cidfile=${cidfile} --name ${app} ${docker_args} ${port_mapping} ${mount_mapping} ${docker_image}",
             'Restart'      => 'always',
             'RestartSec'   => '10s',
+            'ExecStop'     => "${docker_command} stop --ignore --cidfile=${cidfile}",
+            'ExecStopPost' => "${docker_command} rm -f --ignore --cidfile=${cidfile}",
           },
           'Install' => {
             'WantedBy' => 'multi-user.target',