id errors 6

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -17,6 +17,7 @@
 package container
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 	"testing"
@@ -62,12 +63,20 @@ func TestContainerInspectContainsMounts(t *testing.T) {
 		"--name", testContainer,
 		"--network", "none",
 		"-v", "/anony-vol",
+		"--tmpfs", "/app1:size=64m",
 		"--mount", "type=bind,src=/tmp,dst=/app2,ro",
 		"--mount", fmt.Sprintf("type=volume,src=%s,dst=/app3,readonly=false", testVolume),
 		testutil.NginxAlpineImage).AssertOK()
 
+	t.Logf("before calling inspect in TestContainerInspectContainsMounts")
 	inspect := base.InspectContainer(testContainer)
-	t.Logf("inspect in TestContainerInspectContainsMounts: %+v", inspect)
+	t.Logf("after calling inspect in TestContainerInspectContainsMounts")
+	inspectJSON, err := json.MarshalIndent(inspect, "", "  ")
+	if err != nil {
+		t.Errorf("Failed to marshal inspect: %v", err)
+	} else {
+		t.Logf("inspect in TestContainerInspectContainsMounts:\n%s", string(inspectJSON))
+	}
 	t.Logf("inspect.Mounts in TestContainerInspectContainsMounts: %+v", inspect.Mounts)
 	// convert array to map to get by key of Destination
 	actual := make(map[string]dockercompat.MountPoint)
@@ -119,19 +128,6 @@ func TestContainerInspectContainsMounts(t *testing.T) {
 				RW:          true,
 			},
 		},
-
-		// Tmpfs
-		{
-			dest: "/app1",
-			mountPoint: dockercompat.MountPoint{
-				Type:        "tmpfs",
-				Name:        "",
-				Source:      "tmpfs",
-				Destination: "/app1",
-				Mode:        "noexec,nosuid,nodev,size=64m",
-				RW:          true,
-			},
-		},
 	}
 
 	for i := range expected {

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -343,11 +343,13 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 			return nil, err
 		}
 		c.Mounts = mounts
-		if len(mounts) > 0 {
-			tmpfsMounts = filterTmpfsMounts(mounts)
-		}
+		// if len(mounts) > 0 {
+		// 	tmpfsMounts = filterTmpfsMounts(mounts)
+		// }
 	}
+	// if len(tmpfsMounts) > 0 {
 	c.HostConfig.Tmpfs = tmpfsMounts
+	// }
 
 	if nedctlExtraHosts := n.Labels[labels.ExtraHosts]; nedctlExtraHosts != "" {
 		c.HostConfig.ExtraHosts = parseExtraHosts(nedctlExtraHosts)

pkg/inspecttypes/dockercompat/dockercompat_test.go

@@ -83,7 +83,6 @@ func TestContainerFromNative(t *testing.T) {
 						Opts:   map[string]string{},
 					},
 					UTSMode: "host",
-					Tmpfs:   []MountPoint{},
 				},
 				Mounts: []MountPoint{
 					{

pkg/testutil/testutil.go

@@ -216,6 +216,9 @@ func (b *Base) InspectContainer(name string) dockercompat.Container {
 	cmdResult := b.Cmd("container", "inspect", name).Run()
 	assert.Equal(b.T, cmdResult.ExitCode, 0)
 	var dc []dockercompat.Container
+	b.T.Log("==========")
+	b.T.Log(cmdResult.Stdout())
+	b.T.Log("==========")
 	if err := json.Unmarshal([]byte(cmdResult.Stdout()), &dc); err != nil {
 		b.T.Fatal(err)
 	}