Merge pull request containers#10206 from Luap99/fix-9837

compat api: Networks must be empty instead of null
Luap99 · May 4, 2021 · dea6189 · dea6189
2 parents 5204842 + f185666
commit dea6189
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
@@ -22,6 +22,7 @@ import (
 	"github.com/containers/podman/v3/pkg/util"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/network"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
 	"github.com/gorilla/schema"
@@ -526,6 +527,10 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 	if err := json.Unmarshal(n, &networkSettings); err != nil {
 		return nil, err
 	}
+	// do not report null instead use an empty map
+	if networkSettings.Networks == nil {
+		networkSettings.Networks = map[string]*network.EndpointSettings{}
+	}
 
 	c := types.ContainerJSON{
 		ContainerJSONBase: &cb,

diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
@@ -205,10 +205,15 @@ t GET containers/$cid/json 200 \
 t POST containers/create Image=$IMAGE Entrypoint='["top"]' 201 \
   .Id~[0-9a-f]\\{64\\}
 cid_top=$(jq -r '.Id' <<<"$output")
+network_expect="{}"
+if root; then
+    network_expect='.podman.NetworkID=podman'
+fi
 t GET containers/${cid_top}/json 200 \
   .Config.Entrypoint[0]="top" \
   .Config.Cmd='[]' \
   .Path="top"
+  .NetworkSettings.Networks="$network_expect"
 t POST  containers/${cid_top}/start 204
 # make sure the container is running
 t GET containers/${cid_top}/json 200 \