diff options
| author | baude <bbaude@redhat.com> | 2018-07-12 09:51:31 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-12 21:45:47 +0000 |
| commit | 4f699db8dad05b770b4e02d3de67137517c3463b (patch) | |
| tree | a7f474b248d283dd8805da73bf2b63ca56e4fd67 /libpod/container_internal.go | |
| parent | e615b7d67124c548a3c7b422348821204ce32775 (diff) | |
| download | podman-4f699db8dad05b770b4e02d3de67137517c3463b.tar.gz podman-4f699db8dad05b770b4e02d3de67137517c3463b.tar.bz2 podman-4f699db8dad05b770b4e02d3de67137517c3463b.zip | |
Support multiple networks
This is a refresh of Dan William's PR #974 with a rebase and proper
vendoring of ocicni and containernetworking/cni. It adds the ability
to define multiple networks as so:
podman run --network=net1,net2,foobar ...
Signed-off-by: baude <bbaude@redhat.com>
Closes: #1082
Approved by: baude
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index eb9b39a02..905402c47 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -321,9 +321,7 @@ func resetState(state *containerState) error { state.Mounted = false state.State = ContainerStateConfigured state.ExecSessions = make(map[string]*ExecSession) - state.IPs = nil - state.Interfaces = nil - state.Routes = nil + state.NetworkStatus = nil state.BindMounts = make(map[string]string) return nil |