Fix network connect race with docker-compose

Network connect/disconnect has to call the cni plugins when the network namespace is already configured. This is the case for `ContainerStateRunning` and `ContainerStateCreated`. This is important otherwise the network is not attached to this network namespace and libpod will throw errors like `network inspection mismatch...` This problem happened when using `docker-compose up` in attached mode. Signed-off-by: Paul Holzinger <[email protected]>
containers · Jun 11, 2021 · 44d9c45 · 44d9c45
1 parent dffbf16
commit 44d9c45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
@@ -1090,7 +1090,7 @@ func (c *Container) NetworkDisconnect(nameOrID, netName string, force bool) erro
 	}
 
 	c.newNetworkEvent(events.NetworkDisconnect, netName)
-	if c.state.State != define.ContainerStateRunning {
+	if !c.ensureState(define.ContainerStateRunning, define.ContainerStateCreated) {
 		return nil
 	}
 
@@ -1145,7 +1145,7 @@ func (c *Container) NetworkConnect(nameOrID, netName string, aliases []string) e
 		return err
 	}
 	c.newNetworkEvent(events.NetworkConnect, netName)
-	if c.state.State != define.ContainerStateRunning {
+	if !c.ensureState(define.ContainerStateRunning, define.ContainerStateCreated) {
 		return nil
 	}
 	if c.state.NetNS == nil {

diff --git a/test/compose/test-compose b/test/compose/test-compose
@@ -183,6 +183,8 @@ function test_port() {
         fi
         echo "# cat $WORKDIR/server.log:"
         cat $WORKDIR/server.log
+        echo "# cat $logfile:"
+        cat $logfile
         return
     fi