containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5382 from vrothberg/systemd-network 

generate systemd: add network dependencies
This commit is contained in:
OpenShift Merge Robot 2020-03-05 06:44:40 -05:00 committed by GitHub
parent 0356c0ed91 05a0bf7c07
commit 9ffc525da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/systemd/generate/systemdgen.go
View File

@ -80,6 +80,8 @@ const containerTemplate = `# {{.ServiceName}}.service
[Unit] [Unit]
Description=Podman {{.ServiceName}}.service Description=Podman {{.ServiceName}}.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
{{- if .BoundToServices}} {{- if .BoundToServices}}
RefuseManualStart=yes RefuseManualStart=yes
RefuseManualStop=yes RefuseManualStop=yes

10
pkg/systemd/generate/systemdgen_test.go
View File

@ -40,6 +40,8 @@ func TestCreateContainerSystemdUnit(t *testing.T) {
[Unit] [Unit]
Description=Podman container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service Description=Podman container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
[Service] [Service]
Restart=always Restart=always
@ -58,6 +60,8 @@ WantedBy=multi-user.target`
[Unit] [Unit]
Description=Podman container-foobar.service Description=Podman container-foobar.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
[Service] [Service]
Restart=always Restart=always
@ -76,6 +80,8 @@ WantedBy=multi-user.target`
[Unit] [Unit]
Description=Podman container-foobar.service Description=Podman container-foobar.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
RefuseManualStart=yes RefuseManualStart=yes
RefuseManualStop=yes RefuseManualStop=yes
BindsTo=a.service b.service c.service pod.service BindsTo=a.service b.service c.service pod.service
@ -98,6 +104,8 @@ WantedBy=multi-user.target`
[Unit] [Unit]
Description=Podman pod-123abc.service Description=Podman pod-123abc.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
Requires=container-1.service container-2.service Requires=container-1.service container-2.service
Before=container-1.service container-2.service Before=container-1.service container-2.service
@ -118,6 +126,8 @@ WantedBy=multi-user.target`
[Unit] [Unit]
Description=Podman jadda-jadda.service Description=Podman jadda-jadda.service
Documentation=man:podman-generate-systemd(1) Documentation=man:podman-generate-systemd(1)
Wants=network.target
After=network-online.target
[Service] [Service]
Restart=always Restart=always