Set network ID if available during container inspect. Fixes container…

…s#24910

Signed-off-by: Florian Apolloner <[email protected]>

contrib/cirrus/setup_environment.sh

@@ -383,7 +383,7 @@ case "$TEST_FLAVOR" in
         ;;
     compose_v2)
         showrun dnf -y remove docker-compose
-        showrun curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+        showrun curl -SL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
         showrun chmod +x /usr/local/bin/docker-compose
         ;& # Continue with next item
     apiv2)

libpod/networking_common.go

@@ -242,8 +242,13 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e
 		if len(networks) > 0 {
 			settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(networks))
 			for net, opts := range networks {
+				netID := net
+				network, err := c.runtime.network.NetworkInspect(net)
+				if err == nil {
+					netID = network.ID
+				}
 				cniNet := new(define.InspectAdditionalNetwork)
-				cniNet.NetworkID = net
+				cniNet.NetworkID = netID
 				cniNet.Aliases = opts.Aliases
 				settings.Networks[net] = cniNet
 			}
@@ -272,9 +277,14 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e
 		settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(networks))
 
 		for name, opts := range networks {
+			netID := name
+			network, err := c.runtime.network.NetworkInspect(name)
+			if err == nil {
+				netID = network.ID
+			}
 			result := netStatus[name]
 			addedNet := new(define.InspectAdditionalNetwork)
-			addedNet.NetworkID = name
+			addedNet.NetworkID = netID
 			addedNet.Aliases = opts.Aliases
 			addedNet.InspectBasicNetworkConfig = resultToBasicNetworkConfig(result)
 

test/compose/uptwice/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
     app:
         build: .

test/compose/uptwice/tests.sh

@@ -1,6 +1,5 @@
 # -*- bash -*-
 
-CR=$'\r'
 NL=$'\n'
 
 cp docker-compose.yml docker-compose.yml.bak
@@ -10,5 +9,5 @@ output=$(podman_compose up -d 2>&1)
 # Horrible output check here but we really want to make sure that there are
 # no unexpected warning/errors and the normal messages are send on stderr as
 # well so we cannot check for an empty stderr.
-expected="Container uptwice-app-1  Recreate${NL}Container uptwice-app-1  Recreated${NL}Container uptwice-app-1  Starting${NL}Container uptwice-app-1  Started"
+expected=" Container uptwice-app-1  Recreate${NL} Container uptwice-app-1  Recreated${NL} Container uptwice-app-1  Starting${NL} Container uptwice-app-1  Started${NL}"
 is "$output" "$expected" "no error output in compose up (#15580)"

test/compose/uptwice_idempotent/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+  app:
+    image: alpine
+    command: [sleep, infinity]
+    networks:
+      - net1
+networks:
+  net1:

test/compose/uptwice_idempotent/tests.sh

@@ -0,0 +1,11 @@
+# -*- bash -*-
+
+NL=$'\n'
+
+output=$(podman_compose up -d 2>&1)
+
+# Horrible output check here but we really want to make sure that there are
+# no unexpected warning/errors and the normal messages are send on stderr as
+# well so we cannot check for an empty stderr.
+expected=" Container uptwice_idempotent-app-1  Running${NL}"
+is "$output" "$expected" "no container recreation in compose up (#24950)"