diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-29 06:56:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 06:56:15 -0400 |
| commit | e78363d24ce631c36579a294864af159f180a535 (patch) | |
| tree | d1a6fa18e113447c71f22f785b1bddc2ea133da6 /libpod/networking_linux.go | |
| parent | 3a6342062821cec7670bd9b4a5f3234866a8ed8e (diff) | |
| parent | 78aec2130242b81659bd199c6c8605c76e681ff6 (diff) | |
| download | podman-e78363d24ce631c36579a294864af159f180a535.tar.gz podman-e78363d24ce631c36579a294864af159f180a535.tar.bz2 podman-e78363d24ce631c36579a294864af159f180a535.zip | |
Merge pull request #15516 from kubealex/handle-connected-network
Handle an already connected network in libpod API
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index c05796768..c10c3c0b2 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1357,6 +1357,11 @@ func (c *Container) NetworkConnect(nameOrID, netName string, netOpts types.PerNe } if err := c.runtime.state.NetworkConnect(c, netName, netOpts); err != nil { + // Docker compat: treat requests to attach already attached networks as a no-op, ignoring opts + if errors.Is(err, define.ErrNetworkConnected) && c.ensureState(define.ContainerStateConfigured) { + return nil + } + return err } c.newNetworkEvent(events.NetworkConnect, netName) |