diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-15 16:30:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 16:30:38 +0100 |
| commit | e9d8ca22b8ea5923d6188225cd2d2254bdc4d898 (patch) | |
| tree | dbb04a3758c48fbaf3289d624e3fe84518133206 /pkg/domain | |
| parent | d40736fef1c0cbfc57ed39678bf95c016a13b512 (diff) | |
| parent | 73e1cdfe9e41a8748b75b9461c087e4cee5d2183 (diff) | |
| download | podman-e9d8ca22b8ea5923d6188225cd2d2254bdc4d898.tar.gz podman-e9d8ca22b8ea5923d6188225cd2d2254bdc4d898.tar.bz2 podman-e9d8ca22b8ea5923d6188225cd2d2254bdc4d898.zip | |
Merge pull request #11076 from boaz0/closes_10275
Support template unit files in podman generate systemd
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/generate.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/generate.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/generate.go b/pkg/domain/entities/generate.go index 7809c5241..dfb5bfc6c 100644 --- a/pkg/domain/entities/generate.go +++ b/pkg/domain/entities/generate.go @@ -20,6 +20,8 @@ type GenerateSystemdOptions struct { Separator string // NoHeader - skip header generation NoHeader bool + // TemplateUnitFile - make use of %i and %I to differentiate between the different instances of the unit + TemplateUnitFile bool } // GenerateSystemdReport diff --git a/pkg/domain/infra/tunnel/generate.go b/pkg/domain/infra/tunnel/generate.go index 9f69abb1a..3a35dd59c 100644 --- a/pkg/domain/infra/tunnel/generate.go +++ b/pkg/domain/infra/tunnel/generate.go @@ -8,7 +8,7 @@ import ( ) func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, opts entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) { - options := new(generate.SystemdOptions).WithUseName(opts.Name).WithContainerPrefix(opts.ContainerPrefix).WithNew(opts.New).WithNoHeader(opts.NoHeader) + options := new(generate.SystemdOptions).WithUseName(opts.Name).WithContainerPrefix(opts.ContainerPrefix).WithNew(opts.New).WithNoHeader(opts.NoHeader).WithTemplateUnitFile(opts.TemplateUnitFile) options.WithPodPrefix(opts.PodPrefix).WithSeparator(opts.Separator) if opts.RestartPolicy != nil { options.WithRestartPolicy(*opts.RestartPolicy) |