diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-11 10:56:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 10:56:11 -0400 |
| commit | 39ad0387ca27097875b02b55c6f71c2f2b8bdd6c (patch) | |
| tree | 0c870e02eb98c1f1db60d5dd44e7ebf2a7450335 /pkg/specgen | |
| parent | f1b6840382ffdfe9811c64b3aea75218d9b14e5e (diff) | |
| parent | c7c81a8c081f6f7458345027f315a796d6ca5eda (diff) | |
| download | podman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.tar.gz podman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.tar.bz2 podman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.zip | |
Merge pull request #6415 from vrothberg/systemd-new-pod
podman-generate-systemd --new for pods
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 4 | ||||
| -rw-r--r-- | pkg/specgen/podspecgen.go | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index cd2d69cfb..5ccb1ba80 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -93,5 +93,9 @@ func createPodOptions(p *specgen.PodSpecGenerator) ([]libpod.PodCreateOption, er options = append(options, libpod.WithInfraContainerPorts(ports)) } options = append(options, libpod.WithPodCgroups()) + options = append(options, libpod.WithPodCreateCommand()) + if len(p.InfraConmonPidFile) > 0 { + options = append(options, libpod.WithInfraConmonPidFile(p.InfraConmonPidFile)) + } return options, nil } diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 11976233a..600d27004 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -25,6 +25,9 @@ type PodBasicConfig struct { // InfraCommand and InfraImages in this struct. // Optional. NoInfra bool `json:"no_infra,omitempty"` + // InfraConmonPidFile is a custom path to store the infra container's + // conmon PID. + InfraConmonPidFile string `json:"infra_conmon_pid_file,omitempty"` // InfraCommand sets the command that will be used to start the infra // container. // If not set, the default set in the Libpod configuration file will be |