diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-08 15:36:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 15:36:58 +0100 |
| commit | a58c0bb39ada24ea21204702d07117bf24d24156 (patch) | |
| tree | 3d4c8d3b1832e9dc9bbed261515c50e1db701db5 /libpod/runtime_ctr.go | |
| parent | d6ef903164512e6fa7903bb0b85a1852117df37b (diff) | |
| parent | 6444f2402839330f977cfe1c701ca331a915047b (diff) | |
| download | podman-a58c0bb39ada24ea21204702d07117bf24d24156.tar.gz podman-a58c0bb39ada24ea21204702d07117bf24d24156.tar.bz2 podman-a58c0bb39ada24ea21204702d07117bf24d24156.zip | |
Merge pull request #12137 from vrothberg/fix-11735
pod/container create: resolve conflicts of generated names
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 0a7db33f1..114bf9315 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -326,15 +326,6 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai } } - if ctr.config.Name == "" { - name, err := r.generateName() - if err != nil { - return nil, err - } - - ctr.config.Name = name - } - // Check CGroup parent sanity, and set it if it was not set. // Only if we're actually configuring CGroups. if !ctr.config.NoCgroups { |