chore: add CIdFile and GroupAdd to nerdctl inspect response

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

Author: coderbirju

pkg/cmd/container/create.go

@@ -99,6 +99,7 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
 		if err := writeCIDFile(options.CidFile, id); err != nil {
 			return nil, nil, err
 		}
+		internalLabels.cidFile = options.CidFile
 	}
 	dataStore, err := clientutil.DataStore(options.GOptions.DataRoot, options.GOptions.Address)
 	if err != nil {
@@ -269,6 +270,7 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
 	}
 	opts = append(opts, uOpts...)
 	gOpts, err := generateGroupsOpts(options.GroupAdd)
+	internalLabels.groupAdd = options.GroupAdd
 	if err != nil {
 		return nil, generateRemoveOrphanedDirsFunc(ctx, id, dataStore, internalLabels), err
 	}
@@ -651,6 +653,12 @@ type internalLabels struct {
 	// a label to check whether the --rm option is specified.
 	rm        string
 	logConfig logging.LogConfig
+
+	// a label to chek if --cidfile is set
+	cidFile string
+
+	// label to check if --group-add is set
+	groupAdd []string
 }
 
 // WithInternalLabels sets the internal labels for a container.
@@ -749,6 +757,18 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
 		m[labels.CPUSetCPUs] = internalLabels.cpusetCpus
 	}
 
+	if internalLabels.cidFile != "" {
+		m[labels.CIdFile] = internalLabels.cidFile
+	}
+
+	if len(internalLabels.groupAdd) > 0 {
+		groupAddJSON, err := json.Marshal(internalLabels.groupAdd)
+		if err != nil {
+			return nil, err
+		}
+		m[labels.GroupAdd] = string(groupAddJSON)
+	}
+
 	return containerd.WithAdditionalContainerLabels(m), nil
 }
 

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -45,6 +45,7 @@ import (
 
 	"github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
+	"github.com/containerd/nerdctl/v2/pkg/ipcutil"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
 	"github.com/containerd/nerdctl/v2/pkg/ocihook/state"
 )
@@ -141,12 +142,15 @@ 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      // CpusetMems 0-2, 0,1
-	CpusetCpus   string      // CpusetCpus 0-2, 0,1
+	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      // CpusetMems 0-2, 0,1
+	CpusetCpus      string      // CpusetCpus 0-2, 0,1
+	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
 }
 
 // From https://github.com/moby/moby/blob/v20.10.1/api/types/types.go#L416-L427
@@ -347,6 +351,22 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 		c.HostConfig.CpusetCpus = cpusetcpus
 	}
 
+	if cidFile := n.Labels[labels.CIdFile]; cidFile != "" {
+		c.HostConfig.ContainerIDFile = cidFile
+	}
+
+	if groupAdd := n.Labels[labels.GroupAdd]; groupAdd != "" {
+		c.HostConfig.GroupAdd = parseGroups(groupAdd)
+	}
+
+	if ipcMode := n.Labels[labels.IPC]; ipcMode != "" {
+		ipc, err := ipcutil.DecodeIPCLabel(ipcMode)
+		if err != nil {
+			return nil, fmt.Errorf("failed to Decode IPC Label: %v", err)
+		}
+		c.HostConfig.IpcMode = string(ipc.Mode)
+	}
+
 	cs := new(ContainerState)
 	cs.Restarting = n.Labels[restart.StatusLabel] == string(containerd.Running)
 	cs.Error = n.Labels[labels.Error]
@@ -566,6 +586,14 @@ func parseExtraHosts(extraHostsJSON string) []string {
 	return extraHosts
 }
 
+func parseGroups(groupAddJSON string) []string {
+	var groupAdd []string
+	if err := json.Unmarshal([]byte(groupAddJSON), &groupAdd); err != nil {
+		return []string{}
+	}
+	return groupAdd
+}
+
 type IPAMConfig struct {
 	Subnet  string `json:"Subnet,omitempty"`
 	Gateway string `json:"Gateway,omitempty"`

pkg/labels/labels.go

@@ -115,4 +115,10 @@ const (
 
 	// CPUSetMems to check if the --cpuset-mems is specified
 	CPUSetMems = Prefix + "cpuset-mems"
+
+	// Cidfile is the ContainerId file set via the --cidfile flag
+	CIdFile = Prefix + "cid-file"
+
+	// GroupAdd is the List of additional groups, set via --group-add flag
+	GroupAdd = Prefix + "group-add"
 )