diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-05 05:51:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 05:51:19 -0400 |
| commit | 7af4612d6b969329a78b4945c35a641449989a2d (patch) | |
| tree | 1b4e70fa3cce85f9d0ab53ae0b3cd8fb97da0faf /pkg/specgen/generate/container_create.go | |
| parent | 97beca9e83ea5afee5f07249967cb1bdda2b9803 (diff) | |
| parent | 1585b175dbf47e7ee0d5a26600aaec898ec5c26b (diff) | |
| download | podman-7af4612d6b969329a78b4945c35a641449989a2d.tar.gz podman-7af4612d6b969329a78b4945c35a641449989a2d.tar.bz2 podman-7af4612d6b969329a78b4945c35a641449989a2d.zip | |
Merge pull request #14059 from cdoern/clone
pass networks to container clone
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 8b9ed8ffe..19a2b702c 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -175,13 +175,15 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener return nil, nil, nil, errors.New("the given container could not be retrieved") } conf := c.Config() - out, err := json.Marshal(conf.Spec.Linux) - if err != nil { - return nil, nil, nil, err - } - err = json.Unmarshal(out, runtimeSpec.Linux) - if err != nil { - return nil, nil, nil, err + if conf != nil && conf.Spec != nil && conf.Spec.Linux != nil { + out, err := json.Marshal(conf.Spec.Linux) + if err != nil { + return nil, nil, nil, err + } + err = json.Unmarshal(out, runtimeSpec.Linux) + if err != nil { + return nil, nil, nil, err + } } if s.ResourceLimits != nil { switch { |