id errors 6

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

Author: coderbirju

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -67,8 +67,6 @@ func TestContainerInspectContainsMounts(t *testing.T) {
 		testutil.NginxAlpineImage).AssertOK()
 
 	inspect := base.InspectContainer(testContainer)
-	t.Logf("inspect in TestContainerInspectContainsMounts: %+v", inspect)
-	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)
 	for i := range inspect.Mounts {
@@ -119,19 +117,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 {
@@ -431,3 +416,52 @@ func TestContainerInspectHostConfigPIDDefaults(t *testing.T) {
 // 	assert.DeepEqual(t, expectedSysctls, inspect.HostConfig.Sysctls)
 // 	expectedDevices := []string{"/dev/null:/dev/null"}
 // 	assert.DeepEqual(t, expectedDevices, inspect.HostConfig.Devices)
+
+// func TestContainerInspectHostConfigAdvanced(t *testing.T) {
+// 	testContainer := testutil.Identifier(t)
+
+// 	base := testutil.NewBase(t)
+// 	defer base.Cmd("rm", "-f", testContainer).Run()
+
+// 	// Run a container with various advanced HostConfig options
+// 	base.Cmd("run", "-d", "--name", testContainer,
+// 		"--read-only",
+// 		"--uts", "host",
+// 		"--shm-size", "256m",
+// 		"--runtime", "io.containerd.runtime.v1.linux",
+// 		"--sysctl", "net.core.somaxconn=1024",
+// 		"--device", "/dev/null:/dev/null",
+// 		testutil.AlpineImage, "sleep", "infinity").AssertOK()
+
+// 	inspect := base.InspectContainer(testContainer)
+
+// 	// Check ReadonlyRootfs
+// 	assert.Equal(t, true, inspect.HostConfig.ReadonlyRootfs)
+
+// 	// Check UTSMode
+// 	assert.Equal(t, "host", inspect.HostConfig.UTSMode)
+
+// 	// Check ShmSize
+// 	assert.Equal(t, int64(268435456), inspect.HostConfig.ShmSize)
+
+// 	// Check Runtime
+// 	assert.Equal(t, "io.containerd.runtime.v1.linux", inspect.HostConfig.Runtime)
+
+// 	// Check Sysctls
+// 	expectedSysctls := map[string]string{
+// 		"net.core.somaxconn": "1024",
+// 	}
+// 	assert.DeepEqual(t, expectedSysctls, inspect.HostConfig.Sysctls)
+
+// 	// Check Devices
+// 	expectedDevices := []string{"/dev/null:/dev/null"}
+// 	assert.DeepEqual(t, expectedDevices, inspect.HostConfig.Devices)
+
+// 	// Log the entire HostConfig for debugging
+// 	hostConfigJSON, err := json.MarshalIndent(inspect.HostConfig, "", "  ")
+// 	if err != nil {
+// 		t.Errorf("Failed to marshal HostConfig: %v", err)
+// 	} else {
+// 		t.Logf("HostConfig in TestContainerInspectHostConfigAdvanced:\n%s", string(hostConfigJSON))
+// 	}
+// }

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -344,10 +344,13 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 		}
 		c.Mounts = mounts
 		if len(mounts) > 0 {
-			tmpfsMounts = filterTmpfsMounts(mounts)
+			tmpfsMounts = mounts
+			// 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)
 	}