Merge pull request #429 from Mashimiao/generate-add-console-size-option

add ConsoleSize option

Author: liangchenye

cmd/oci-runtime-tool/generate.go

@@ -79,6 +79,7 @@ var generateFlags = []cli.Flag{
 	cli.StringSliceFlag{Name: "process-cap-add", Usage: "add Linux capabilities"},
 	cli.StringSliceFlag{Name: "process-cap-drop", Usage: "drop Linux capabilities"},
 	cli.BoolFlag{Name: "process-cap-drop-all", Usage: "drop all Linux capabilities"},
+	cli.StringFlag{Name: "process-consolesize", Usage: "specifies the console size in characters (width:height)"},
 	cli.StringFlag{Name: "process-cwd", Value: "/", Usage: "current working directory for the process"},
 	cli.IntFlag{Name: "process-gid", Usage: "gid for the process"},
 	cli.StringSliceFlag{Name: "process-groups", Usage: "supplementary groups for the process"},
@@ -276,6 +277,15 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
+	if context.IsSet("process-consolesize") {
+		consoleSize := context.String("process-consolesize")
+		width, height, err := parseConsoleSize(consoleSize)
+		if err != nil {
+			return err
+		}
+		g.SetProcessConsoleSize(width, height)
+	}
+
 	if context.Bool("process-cap-drop-all") {
 		g.ClearProcessCapabilities()
 	}
@@ -561,6 +571,25 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	return err
 }
 
+func parseConsoleSize(consoleSize string) (uint, uint, error) {
+	size := strings.Split(consoleSize, ":")
+	if len(size) != 2 {
+		return 0, 0, fmt.Errorf("invalid consolesize value: %s", consoleSize)
+	}
+
+	width, err := strconv.Atoi(size[0])
+	if err != nil {
+		return 0, 0, err
+	}
+
+	height, err := strconv.Atoi(size[1])
+	if err != nil {
+		return 0, 0, err
+	}
+
+	return uint(width), uint(height), nil
+}
+
 func parseIDMapping(idms string) (uint32, uint32, uint32, error) {
 	idm := strings.Split(idms, ":")
 	if len(idm) != 3 {

completions/bash/oci-runtime-tool

@@ -359,6 +359,7 @@ _oci-runtime-tool_generate() {
 		--output
 		--process-cap-add
 		--process-cap-drop
+		--process-consolesize
 		--process-cwd
 		--process-gid
 		--process-groups

generate/generate.go

@@ -341,6 +341,13 @@ func (g *Generator) RemoveAnnotation(key string) {
 	delete(g.spec.Annotations, key)
 }
 
+// SetProcessConsoleSize sets g.spec.Process.ConsoleSize.
+func (g *Generator) SetProcessConsoleSize(width, height uint) {
+	g.initSpecProcessConsoleSize()
+	g.spec.Process.ConsoleSize.Width = width
+	g.spec.Process.ConsoleSize.Height = height
+}
+
 // SetProcessUID sets g.spec.Process.User.UID.
 func (g *Generator) SetProcessUID(uid uint32) {
 	g.initSpecProcess()

generate/spec.go

@@ -17,6 +17,13 @@ func (g *Generator) initSpecProcess() {
 	}
 }
 
+func (g *Generator) initSpecProcessConsoleSize() {
+	g.initSpecProcess()
+	if g.spec.Process.ConsoleSize == nil {
+		g.spec.Process.ConsoleSize = &rspec.Box{}
+	}
+}
+
 func (g *Generator) initSpecProcessCapabilities() {
 	g.initSpecProcess()
 	if g.spec.Process.Capabilities == nil {

man/oci-runtime-tool-generate.1.md

@@ -283,6 +283,9 @@ read the configuration from `config.json`.
 **--process-cap-drop-all**true|false
   Drop all Linux capabilities
 
+**--process-consolesize**=WIDTH:HEIGHT
+  Specifies the console size in characters of the terminal. e.g. --process-consolesize=80:40
+
 **--process-cwd**=PATH
   Current working directory for the process. The default is */*.