From dcc9dfb27d49c7e7f58e04bf5656656f69e76fe1 Mon Sep 17 00:00:00 2001
From: Mikhail Sobolev <mss@mawhrin.net>
Date: Thu, 28 Mar 2013 07:50:33 +0200
Subject: [PATCH 1/2] make complex options to stand out

---
 container.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/container.go b/container.go
index 8f993a35e1..c8bbc16a3e 100644
--- a/container.go
+++ b/container.go
@@ -72,11 +72,13 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
 	flStdin := cmd.Bool("i", false, "Keep stdin open even if not attached")
 	flTty := cmd.Bool("t", false, "Allocate a pseudo-tty")
 	flMemory := cmd.Int64("m", 0, "Memory limit (in bytes)")
-	var flPorts ports
 
+	var flPorts ports
 	cmd.Var(&flPorts, "p", "Map a network port to the container")
+
 	var flEnv ListOpts
 	cmd.Var(&flEnv, "e", "Set environment variables")
+
 	if err := cmd.Parse(args); err != nil {
 		return nil, err
 	}

From f65fc1e766cefed06131acf1ede6bb1f25f75fff Mon Sep 17 00:00:00 2001
From: Mikhail Sobolev <mss@mawhrin.net>
Date: Mon, 1 Apr 2013 23:03:24 +0300
Subject: [PATCH 2/2] add host name parameter to "run" command

fixes #243
---
 container.go                     | 2 ++
 docs/sources/commandline/cli.rst | 1 +
 2 files changed, 3 insertions(+)

diff --git a/container.go b/container.go
index c8bbc16a3e..e4c8f0635c 100644
--- a/container.go
+++ b/container.go
@@ -67,6 +67,7 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
 		cmd.SetOutput(ioutil.Discard)
 	}
 
+	flHostname := cmd.String("h", "", "Container host name")
 	flUser := cmd.String("u", "", "Username or UID")
 	flDetach := cmd.Bool("d", false, "Detached mode: leave the container running in the background")
 	flStdin := cmd.Bool("i", false, "Keep stdin open even if not attached")
@@ -92,6 +93,7 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
 		runCmd = parsedArgs[1:]
 	}
 	config := &Config{
+		Hostname:  *flHostname,
 		Ports:     flPorts,
 		User:      *flUser,
 		Tty:       *flTty,
diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst
index 139e75927f..5b7e563151 100644
--- a/docs/sources/commandline/cli.rst
+++ b/docs/sources/commandline/cli.rst
@@ -264,6 +264,7 @@ run
     -m=0: Memory limit (in bytes)
     -p=[]: Map a network port to the container
     -t=false: Allocate a pseudo-tty
+    -h="": Container host name
     -u="": Username or UID