diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-22 12:09:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-22 12:09:56 +0100 |
| commit | 85f21fb2bd39d76300ab61a1fb1207405e05f9d2 (patch) | |
| tree | 342fb99e4c547e9818805bad80b8ccf58427c340 /pkg/domain | |
| parent | d2fcfef8b07532dc7418079160f0d6b989143c25 (diff) | |
| parent | 20ce6e5c6031bd4180514ec412760a294f8a83a2 (diff) | |
| download | podman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.tar.gz podman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.tar.bz2 podman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.zip | |
Merge pull request #12664 from cdoern/noManagePasswd
Podman run --passwd
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/containers.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 1677c067f..ae441b7f3 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -341,6 +341,7 @@ type ContainerRunOptions struct { Rm bool SigProxy bool Spec *specgen.SpecGenerator + Passwd bool } // ContainerRunReport describes the results of running diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index d1af4a479..bf4dcff62 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -927,6 +927,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta for _, w := range warn { fmt.Fprintf(os.Stderr, "%s\n", w) } + rtSpec, spec, optsN, err := generate.MakeContainer(ctx, ic.Libpod, opts.Spec) if err != nil { return nil, err |