chore: add runtime and sysctl to inspect response

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

Author: coderbirju

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -253,6 +253,8 @@ func TestContainerInspectHostConfig(t *testing.T) {
 		"--read-only",
 		"--uts", "host",
 		"--shm-size", "256m",
+		"--runtime", "io.containerd.runtime.v1.linux",
+		"--sysctl", "net.core.somaxconn=1024",
 		testutil.AlpineImage, "sleep", "infinity").AssertOK()
 
 	inspect := base.InspectContainer(testContainer)
@@ -274,6 +276,11 @@ func TestContainerInspectHostConfig(t *testing.T) {
 	assert.Equal(t, true, inspect.HostConfig.ReadonlyRootfs)
 	assert.Equal(t, "host", inspect.HostConfig.UTSMode)
 	assert.Equal(t, int64(268435456), inspect.HostConfig.ShmSize)
+	assert.Equal(t, "io.containerd.runtime.v1.linux", inspect.HostConfig.Runtime)
+	expectedSysctls := map[string]string{
+		"net.core.somaxconn": "1024",
+	}
+	assert.DeepEqual(t, expectedSysctls, inspect.HostConfig.Sysctls)
 }
 
 func TestContainerInspectHostConfigDefaults(t *testing.T) {
@@ -302,6 +309,8 @@ func TestContainerInspectHostConfigDefaults(t *testing.T) {
 	assert.Equal(t, false, inspect.HostConfig.ReadonlyRootfs)
 	assert.Equal(t, "", inspect.HostConfig.UTSMode)
 	assert.Equal(t, int64(67108864), inspect.HostConfig.ShmSize)
+	assert.Equal(t, "io.containerd.runc.v2", inspect.HostConfig.Runtime)
+	assert.Equal(t, 0, len(inspect.HostConfig.Sysctls))
 }
 
 func TestContainerInspectHostConfigDNS(t *testing.T) {

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -143,29 +143,30 @@ type Container struct {
 // From https://github.com/moby/moby/blob/8dbd90ec00daa26dc45d7da2431c965dec99e8b4/api/types/container/host_config.go#L391
 // HostConfig the non-portable Config structure of a container.
 type HostConfig struct {
-	ExtraHosts      []string    // List of extra hosts
-	PortBindings    nat.PortMap // Port mapping between the exposed port (container) and the host
-	LogConfig       LogConfig   // Configuration of the logs for this container
-	BlkioWeight     uint16      // Block IO weight (relative weight vs. other containers)
-	CPUSetMems      string      `json:"CpusetMems"` // CpusetMems 0-2, 0,1
-	CPUSetCPUs      string      `json:"CpusetCpus"` // CpusetCpus 0-2, 0,1
-	CPUQuota        int64       `json:"CpuQuota"`   // CPU CFS (Completely Fair Scheduler) quota
-	CPUShares       uint64      `json:"CpuShares"`  // CPU shares (relative weight vs. other containers)
-	ContainerIDFile string      // File (path) where the containerId is written
-	GroupAdd        []string    // GroupAdd specifies additional groups to join
-	IpcMode         string      // IPC namespace to use for the container
-	CgroupnsMode    string      // Cgroup namespace mode to use for the container
-	Memory          int64       // Memory limit (in bytes)
-	MemorySwap      int64       // Total memory usage (memory + swap); set `-1` to enable unlimited swap
-	OomKillDisable  bool        // specifies whether to disable OOM Killer
-	DNS             []string    `json:"Dns"`        // List of DNS server to lookup
-	DNSOptions      []string    `json:"DnsOptions"` // List of DNSOption to look for
-	DNSSearch       []string    `json:"DnsSearch"`  // List of DNSSearch to look for
-	OomScoreAdj     int         // specifies the tune container’s OOM preferences (-1000 to 1000, rootless: 100 to 1000)
-	ReadonlyRootfs  bool        // Is the container root filesystem in read-only
-	UTSMode         string      // UTS namespace to use for the container
-	ShmSize         int64       // Size of /dev/shm in bytes. The size must be greater than 0.
-
+	ExtraHosts      []string          // List of extra hosts
+	PortBindings    nat.PortMap       // Port mapping between the exposed port (container) and the host
+	LogConfig       LogConfig         // Configuration of the logs for this container
+	BlkioWeight     uint16            // Block IO weight (relative weight vs. other containers)
+	CPUSetMems      string            `json:"CpusetMems"` // CpusetMems 0-2, 0,1
+	CPUSetCPUs      string            `json:"CpusetCpus"` // CpusetCpus 0-2, 0,1
+	CPUQuota        int64             `json:"CpuQuota"`   // CPU CFS (Completely Fair Scheduler) quota
+	CPUShares       uint64            `json:"CpuShares"`  // CPU shares (relative weight vs. other containers)
+	ContainerIDFile string            // File (path) where the containerId is written
+	GroupAdd        []string          // GroupAdd specifies additional groups to join
+	IpcMode         string            // IPC namespace to use for the container
+	CgroupnsMode    string            // Cgroup namespace mode to use for the container
+	Memory          int64             // Memory limit (in bytes)
+	MemorySwap      int64             // Total memory usage (memory + swap); set `-1` to enable unlimited swap
+	OomKillDisable  bool              // specifies whether to disable OOM Killer
+	DNS             []string          `json:"Dns"`        // List of DNS server to lookup
+	DNSOptions      []string          `json:"DnsOptions"` // List of DNSOption to look for
+	DNSSearch       []string          `json:"DnsSearch"`  // List of DNSSearch to look for
+	OomScoreAdj     int               // specifies the tune container’s OOM preferences (-1000 to 1000, rootless: 100 to 1000)
+	ReadonlyRootfs  bool              // Is the container root filesystem in read-only
+	UTSMode         string            // UTS namespace to use for the container
+	ShmSize         int64             // Size of /dev/shm in bytes. The size must be greater than 0.
+	Sysctls         map[string]string // List of Namespaced sysctls used for the container
+	Runtime         string            // Runtime to use with this container
 }
 
 // From https://github.com/moby/moby/blob/v20.10.1/api/types/types.go#L416-L427
@@ -466,6 +467,13 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 	shmSize, _ := getShmSizeFromNative(n.Spec.(*specs.Spec))
 	c.HostConfig.ShmSize = shmSize
 
+	sysctls, _ := getSysctlFromNative(n.Spec.(*specs.Spec))
+	c.HostConfig.Sysctls = sysctls
+
+	if n.Runtime.Name != "" {
+		c.HostConfig.Runtime = n.Runtime.Name
+	}
+
 	c.State = cs
 	c.Config = &Config{
 		Labels: n.Labels,
@@ -787,6 +795,14 @@ func getShmSizeFromNative(sp *specs.Spec) (int64, error) {
 	return res, nil
 }
 
+func getSysctlFromNative(sp *specs.Spec) (map[string]string, error) {
+	var res map[string]string
+	if sp.Linux != nil && sp.Linux.Sysctl != nil {
+		res = sp.Linux.Sysctl
+	}
+	return res, nil
+}
+
 type IPAMConfig struct {
 	Subnet  string `json:"Subnet,omitempty"`
 	Gateway string `json:"Gateway,omitempty"`