Set the container's hostname to the truncated ID

Upstream-commit: 54fa59c8ec0e20c709cc7b2049f19271750adaab Component: engine
2013-03-26 13:14:44 -07:00
parent 6fac2de23b
commit 60f33c5a95
1 changed files with 7 additions and 1 deletions
@@ -69,9 +69,15 @@ func (runtime *Runtime) Create(config *Config) (*Container, error) {
 	if err != nil {
 		return nil, err
 	}
+	// Generate id
+	id := GenerateId()
+	// Generate default hostname
+	if config.Hostname == "" {
+		config.Hostname = id[:12]
+	}
 	container := &Container{
 		// FIXME: we should generate the ID here instead of receiving it as an argument
-		Id:              GenerateId(),
+		Id:              id,
 		Created:         time.Now(),
 		Path:            config.Cmd[0],
 		Args:            config.Cmd[1:], //FIXME: de-duplicate from config