add back options?

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

Author: coderbirju

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -248,10 +248,17 @@ func TestContainerInspectHostConfig(t *testing.T) {
 		"--add-host", "host2:10.0.0.2",
 		"--ipc", "host",
 		"--memory", "512m",
+		"--read-only",
+		"--shm-size", "256m",
+		"--runtime", "io.containerd.runtime.v1.linux",
+		"--sysctl", "net.core.somaxconn=1024",
 		testutil.AlpineImage, "sleep", "infinity").AssertOK()
 
 	inspect := base.InspectContainer(testContainer)
 
+	// "--uts", "host",
+	// "--device", "/dev/null:/dev/null",
+
 	assert.Equal(t, "0-1", inspect.HostConfig.CPUSetCPUs)
 	assert.Equal(t, "0", inspect.HostConfig.CPUSetMems)
 	assert.Equal(t, uint16(500), inspect.HostConfig.BlkioWeight)
@@ -261,7 +268,6 @@ func TestContainerInspectHostConfig(t *testing.T) {
 	expectedExtraHosts := []string{"host1:10.0.0.1", "host2:10.0.0.2"}
 	assert.DeepEqual(t, expectedExtraHosts, inspect.HostConfig.ExtraHosts)
 	assert.Equal(t, "host", inspect.HostConfig.IpcMode)
-	t.Logf("Actual LogConfig.Driver: %s", inspect.HostConfig.LogConfig.Driver)
 	assert.Equal(t, "", inspect.HostConfig.LogConfig.Driver)
 	assert.Equal(t, int64(536870912), inspect.HostConfig.Memory)
 	assert.Equal(t, int64(1073741824), inspect.HostConfig.MemorySwap)
@@ -400,13 +406,6 @@ func TestContainerInspectHostConfigPIDDefaults(t *testing.T) {
 	assert.Equal(t, "", inspect.HostConfig.PidMode)
 }
 
-// //"--read-only",
-// "--uts", "host",
-// "--shm-size", "256m",
-// "--runtime", "io.containerd.runtime.v1.linux",
-// "--sysctl", "net.core.somaxconn=1024",
-// "--device", "/dev/null:/dev/null",
-
 // assert.Equal(t, true, inspect.HostConfig.ReadonlyRootfs)
 // 	assert.Equal(t, "host", inspect.HostConfig.UTSMode)
 // 	assert.Equal(t, int64(268435456), inspect.HostConfig.ShmSize)

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -562,18 +562,6 @@ func mountsFromNative(spMounts []specs.Mount) []MountPoint {
 	return mountpoints
 }
 
-// filterTmpfsMounts filters the tmpfs mounts
-func filterTmpfsMounts(spMounts []MountPoint) []MountPoint {
-	mountpoints := make([]MountPoint, 0, len(spMounts))
-	for _, m := range spMounts {
-		if m.Type == "tmpfs" {
-			mountpoints = append(mountpoints, m)
-		}
-	}
-
-	return mountpoints
-}
-
 func statusFromNative(x containerd.Status, labels map[string]string) string {
 	switch s := x.Status; s {
 	case containerd.Stopped: