diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-22 16:56:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 16:56:43 -0500 |
| commit | d999328920ce826e5d1ef824c811374bb65ce26b (patch) | |
| tree | 12952a1caffc6e2bfae40ec17ff36a66521b16d3 /libpod/runtime_ctr.go | |
| parent | c69decc305d746066824701ff073d5b34b744693 (diff) | |
| parent | 9d818be7329929b05b93e432c408ee65726ec2c0 (diff) | |
| download | podman-d999328920ce826e5d1ef824c811374bb65ce26b.tar.gz podman-d999328920ce826e5d1ef824c811374bb65ce26b.tar.bz2 podman-d999328920ce826e5d1ef824c811374bb65ce26b.zip | |
Merge pull request #9455 from Luap99/fix-network-ids
Fix podman network IDs handling
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index af87ccca1..8bf862bf2 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -12,6 +12,7 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v3/libpod/network" "github.com/containers/podman/v3/libpod/shutdown" "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities/reports" @@ -285,6 +286,21 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai return nil, err } + // normalize the networks to names + // ocicni only knows about cni names so we have to make + // sure we do not use ids internally + if len(ctr.config.Networks) > 0 { + netNames := make([]string, 0, len(ctr.config.Networks)) + for _, nameOrID := range ctr.config.Networks { + netName, err := network.NormalizeName(r.config, nameOrID) + if err != nil { + return nil, err + } + netNames = append(netNames, netName) + } + ctr.config.Networks = netNames + } + // Inhibit shutdown until creation succeeds shutdown.Inhibit() defer shutdown.Uninhibit() |