From bb2527a7cb077b694e6b5011ff4870897531323f Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 27 Oct 2016 16:20:04 -0700
Subject: [PATCH] Support hostname in Compose file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 api/types/swarm/container.go        |  1 +
 cli/command/stack/deploy.go         | 17 ++++++++-------
 daemon/cluster/convert/container.go | 34 +++++++++++++++--------------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/api/types/swarm/container.go b/api/types/swarm/container.go
index 4a84f2e53f328..fe036bda852f6 100644
--- a/api/types/swarm/container.go
+++ b/api/types/swarm/container.go
@@ -12,6 +12,7 @@ type ContainerSpec struct {
 	Labels          map[string]string `json:",omitempty"`
 	Command         []string          `json:",omitempty"`
 	Args            []string          `json:",omitempty"`
+	Hostname        string            `json:",omitempty"`
 	Env             []string          `json:",omitempty"`
 	Dir             string            `json:",omitempty"`
 	User            string            `json:",omitempty"`
diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go
index c557f9f93a132..7f2c7ab1ef0fe 100644
--- a/cli/command/stack/deploy.go
+++ b/cli/command/stack/deploy.go
@@ -351,14 +351,15 @@ func convertService(
 		},
 		TaskTemplate: swarm.TaskSpec{
 			ContainerSpec: swarm.ContainerSpec{
-				Image:   service.Image,
-				Command: service.Entrypoint,
-				Args:    service.Command,
-				Env:     convertEnvironment(service.Environment),
-				Labels:  getStackLabels(namespace, service.Deploy.Labels),
-				Dir:     service.WorkingDir,
-				User:    service.User,
-				Mounts:  mounts,
+				Image:    service.Image,
+				Command:  service.Entrypoint,
+				Args:     service.Command,
+				Hostname: service.Hostname,
+				Env:      convertEnvironment(service.Environment),
+				Labels:   getStackLabels(namespace, service.Deploy.Labels),
+				Dir:      service.WorkingDir,
+				User:     service.User,
+				Mounts:   mounts,
 			},
 			Placement: &swarm.Placement{
 				Constraints: service.Deploy.Placement.Constraints,
diff --git a/daemon/cluster/convert/container.go b/daemon/cluster/convert/container.go
index 7cac7960b6214..71b9587205b8c 100644
--- a/daemon/cluster/convert/container.go
+++ b/daemon/cluster/convert/container.go
@@ -12,14 +12,15 @@ import (
 
 func containerSpecFromGRPC(c *swarmapi.ContainerSpec) types.ContainerSpec {
 	containerSpec := types.ContainerSpec{
-		Image:   c.Image,
-		Labels:  c.Labels,
-		Command: c.Command,
-		Args:    c.Args,
-		Env:     c.Env,
-		Dir:     c.Dir,
-		User:    c.User,
-		Groups:  c.Groups,
+		Image:    c.Image,
+		Labels:   c.Labels,
+		Command:  c.Command,
+		Args:     c.Args,
+		Hostname: c.Hostname,
+		Env:      c.Env,
+		Dir:      c.Dir,
+		User:     c.User,
+		Groups:   c.Groups,
 	}
 
 	// Mounts
@@ -61,14 +62,15 @@ func containerSpecFromGRPC(c *swarmapi.ContainerSpec) types.ContainerSpec {
 
 func containerToGRPC(c types.ContainerSpec) (*swarmapi.ContainerSpec, error) {
 	containerSpec := &swarmapi.ContainerSpec{
-		Image:   c.Image,
-		Labels:  c.Labels,
-		Command: c.Command,
-		Args:    c.Args,
-		Env:     c.Env,
-		Dir:     c.Dir,
-		User:    c.User,
-		Groups:  c.Groups,
+		Image:    c.Image,
+		Labels:   c.Labels,
+		Command:  c.Command,
+		Args:     c.Args,
+		Hostname: c.Hostname,
+		Env:      c.Env,
+		Dir:      c.Dir,
+		User:     c.User,
+		Groups:   c.Groups,
 	}
 
 	if c.StopGracePeriod != nil {