Merge pull request #767 from wangforthinker/dev-rich-container-v1

feature: add rich container mode

apis/swagger.yml

@@ -1100,7 +1100,21 @@ definitions:
         type: "array"
         items:
           type: "string"
-
+      Rich:
+        type: "boolean"
+        description: "Whether to start container in rich container mode. (default false)"
+        x-nullable: false
+      RichMode:
+        type: "string"
+        description: "Choose one rich container mode.(default dumb-init)"
+        enum:
+          - "dumb-init"
+          - "sbin-init"
+          - "systemd"
+      InitScript:
+        type: "string"
+        description: "Initial script executed in container. The script will be executed before entrypoint or command"        
+
   ContainerCreateResp:
     description: "response returned by daemon when container create successfully"
     type: "object"
@@ -1313,6 +1327,20 @@ definitions:
             description: "Whether to enable lxcfs."
             type: "boolean"
             x-nullable: false
+          Rich:
+            type: "boolean"
+            description: "Whether to start container in rich container mode. (default false)"
+            x-nullable: false
+          RichMode:
+            type: "string"
+            description: "Choose one rich container mode.(default dumb-init)"
+            enum:
+             - "dumb-init"
+             - "sbin-init"
+             - "systemd"
+          InitScript:
+            type: "string"
+            description: "Initial script executed in container. The script will be executed before entrypoint or command"
       - $ref: "#/definitions/Resources"
 
   UpdateConfig:

cli/common_flags.go

@@ -75,5 +75,9 @@ func addCommonFlags(flagSet *pflag.FlagSet) *container {
 
 	flagSet.StringVarP(&c.workdir, "workdir", "w", "", "Set the working directory in a container")
 
+	flagSet.BoolVar(&c.rich, "rich", false, "Start container in rich container mode. (default false)")
+	flagSet.StringVar(&c.richMode, "rich-mode", "", "Choose one rich container mode. dumb-init(default), systemd, sbin-init")
+	flagSet.StringVar(&c.initScript, "initscript", "", "Initial script executed in container")
+
 	return c
 }

cli/container.go

@@ -55,6 +55,11 @@ type container struct {
 	blkioDeviceReadIOps  ThrottleIOpsDevice
 	blkioDeviceWriteIOps ThrottleIOpsDevice
 	IntelRdtL3Cbm        string
+
+	//add for rich container mode
+	rich       bool
+	richMode   string
+	initScript string
 }
 
 func (c *container) config() (*types.ContainerCreateConfig, error) {
@@ -135,6 +140,9 @@ func (c *container) config() (*types.ContainerCreateConfig, error) {
 			User:       c.user,
 			Hostname:   strfmt.Hostname(c.hostname),
 			Labels:     labels,
+			Rich:       c.rich,
+			RichMode:   c.richMode,
+			InitScript: c.initScript,
 		},
 
 		HostConfig: &types.HostConfig{

daemon/mgr/container_rich_mode.go

@@ -0,0 +1,53 @@
+package mgr
+
+import (
+	"fmt"
+
+	"github.com/alibaba/pouch/apis/types"
+)
+
+const (
+	richModeEnv       = "rich_mode=true"
+	richModeLaunchEnv = "rich_mode_launch_manner"
+
+	//for ali internal
+	interRichModeEnv = "ali_run_mode=common_vm"
+)
+
+func richContainerModeEnv(c *ContainerMeta) []string {
+	var (
+		ret         = []string{}
+		setRichMode = false
+		richMode    = ""
+	)
+
+	envs := c.Config.Env
+
+	//if set inter_rich_mode_env, you can also run in rich container mode
+	for _, e := range envs {
+		if e == interRichModeEnv {
+			setRichMode = true
+			richMode = types.ContainerConfigRichModeSystemd
+			break
+		}
+	}
+
+	if c.Config.Rich {
+		setRichMode = true
+	}
+
+	if c.Config.RichMode != "" {
+		richMode = c.Config.RichMode
+	}
+
+	//if not set rich mode manner, default set dumb-init
+	if richMode == "" {
+		richMode = types.ContainerConfigRichModeDumbInit
+	}
+
+	if setRichMode {
+		ret = append(ret, richModeEnv, fmt.Sprintf("%s=%s", richModeLaunchEnv, richMode))
+	}
+
+	return ret
+}