opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-16 10:43:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15777 from vrothberg/fix-14546

Browse Source 
generate systemd: fix pod dependencies
This commit is contained in:
OpenShift Merge Robot
2022-09-14 13:08:04 +02:00
committed by GitHub
parent 9401268360 fe04c86a24
commit ae20f19351
3 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/systemd/generate/pods.go
View File

@ -92,7 +92,7 @@ type podInfo struct {
Requires []string
}
const podTemplate = headerTemplate + `Requires={{{{- range $index, $value := .RequiredServices -}}}}{{{{if $index}}}} {{{{end}}}}{{{{ $value }}}}.service{{{{end}}}}
const podTemplate = headerTemplate + `Wants={{{{- range $index, $value := .RequiredServices -}}}}{{{{if $index}}}} {{{{end}}}}{{{{ $value }}}}.service{{{{end}}}}
Before={{{{- range $index, $value := .RequiredServices -}}}}{{{{if $index}}}} {{{{end}}}}{{{{ $value }}}}.service{{{{end}}}}
{{{{- if or .Wants .After .Requires }}}}
@ -252,6 +252,7 @@ func generatePodInfo(pod *libpod.Pod, options entities.GenerateSystemdOptions) (
StopTimeout: stopTimeout,
GenerateTimestamp: true,
CreateCommand: createCommand,
RunRoot: infraCtr.Runtime().RunRoot(),
}
return &info, nil
}

22
pkg/systemd/generate/pods_test.go
View File

@ -71,7 +71,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -99,7 +99,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -125,7 +125,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
# User-defined dependencies
@ -153,7 +153,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
# User-defined dependencies
@ -181,7 +181,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
# User-defined dependencies
@ -209,7 +209,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
# User-defined dependencies
@ -267,7 +267,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -294,7 +294,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -322,7 +322,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -350,7 +350,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]
@ -378,7 +378,7 @@ Documentation=man:podman-generate-systemd(1)
Wants=network-online.target
After=network-online.target
RequiresMountsFor=/var/run/containers/storage
Requires=container-1.service container-2.service
Wants=container-1.service container-2.service
Before=container-1.service container-2.service
[Service]