Browse code

Merge remote-tracking branch 'sa2ajj/hostname-parameter'

Solomon Hykes authored on 2013/04/03 10:41:14
Showing 2 changed files
... ...
@@ -67,16 +67,19 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
67 67
 		cmd.SetOutput(ioutil.Discard)
68 68
 	}
69 69
 
70
+	flHostname := cmd.String("h", "", "Container host name")
70 71
 	flUser := cmd.String("u", "", "Username or UID")
71 72
 	flDetach := cmd.Bool("d", false, "Detached mode: leave the container running in the background")
72 73
 	flStdin := cmd.Bool("i", false, "Keep stdin open even if not attached")
73 74
 	flTty := cmd.Bool("t", false, "Allocate a pseudo-tty")
74 75
 	flMemory := cmd.Int64("m", 0, "Memory limit (in bytes)")
75
-	var flPorts ports
76 76
 
77
+	var flPorts ports
77 78
 	cmd.Var(&flPorts, "p", "Map a network port to the container")
79
+
78 80
 	var flEnv ListOpts
79 81
 	cmd.Var(&flEnv, "e", "Set environment variables")
82
+
80 83
 	if err := cmd.Parse(args); err != nil {
81 84
 		return nil, err
82 85
 	}
... ...
@@ -90,6 +93,7 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
90 90
 		runCmd = parsedArgs[1:]
91 91
 	}
92 92
 	config := &Config{
93
+		Hostname:  *flHostname,
93 94
 		Ports:     flPorts,
94 95
 		User:      *flUser,
95 96
 		Tty:       *flTty,
... ...
@@ -264,6 +264,7 @@ run
264 264
     -m=0: Memory limit (in bytes)
265 265
     -p=[]: Map a network port to the container
266 266
     -t=false: Allocate a pseudo-tty
267
+    -h="": Container host name
267 268
     -u="": Username or UID
268 269
 
269 270