opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4884 from vrothberg/systemd-ignore

Browse Source 
systemdgen: add --ignore flag to generic services
This commit is contained in:
OpenShift Merge Robot
2020-01-16 18:31:08 +01:00
committed by GitHub
parent 1d7176b135 9d3667c2f0
commit 30245affe9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/systemdgen/systemdgen.go
View File

@ -96,8 +96,8 @@ Restart={{.RestartPolicy}}
{{- if .New}} {{- if .New}}
ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
ExecStart={{.RunCommand}} ExecStart={{.RunCommand}}
ExecStop={{.Executable}} stop --cidfile /%t/%n-cid {{if (ge .StopTimeout 0)}}-t {{.StopTimeout}}{{end}} ExecStop={{.Executable}} stop --ignore --cidfile /%t/%n-cid {{if (ge .StopTimeout 0)}}-t {{.StopTimeout}}{{end}}
ExecStopPost={{.Executable}} rm -f --cidfile /%t/%n-cid ExecStopPost={{.Executable}} rm --ignore -f --cidfile /%t/%n-cid
PIDFile=/%t/%n-pid PIDFile=/%t/%n-pid
{{- else}} {{- else}}
ExecStart={{.Executable}} start {{.ContainerName}} ExecStart={{.Executable}} start {{.ContainerName}}

4
pkg/systemdgen/systemdgen_test.go
View File

@ -123,8 +123,8 @@ Documentation=man:podman-generate-systemd(1)
Restart=always Restart=always
ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN
ExecStop=/usr/bin/podman stop --cidfile /%t/%n-cid -t 42 ExecStop=/usr/bin/podman stop --ignore --cidfile /%t/%n-cid -t 42
ExecStopPost=/usr/bin/podman rm -f --cidfile /%t/%n-cid ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile /%t/%n-cid
PIDFile=/%t/%n-pid PIDFile=/%t/%n-pid
KillMode=none KillMode=none
Type=forking Type=forking

2
test/e2e/generate_systemd_test.go
View File

@ -191,7 +191,7 @@ var _ = Describe("Podman generate systemd", func() {
found, _ := session.GrepString("# container-foo.service") found, _ := session.GrepString("# container-foo.service")
Expect(found).To(BeTrue()) Expect(found).To(BeTrue())
found, _ = session.GrepString("stop --cidfile /%t/%n-cid -t 42") found, _ = session.GrepString("stop --ignore --cidfile /%t/%n-cid -t 42")
Expect(found).To(BeTrue()) Expect(found).To(BeTrue())
}) })