Merge pull request #895 from estesp/add-hostname-env

Random-Liu · web-flow · commit 1e471b1a4439 · 2018-09-05T10:31:34.000-07:00
Add HOSTNAME to env by default for pod containers
diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
@@ -341,6 +341,8 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP
 	for _, e := range config.GetEnvs() {
 		g.AddProcessEnv(e.GetKey(), e.GetValue())
 	}
+	// add the HOSTNAME variable to the environment to match Docker runtime default
+	g.AddProcessEnv("HOSTNAME", sandboxConfig.GetHostname())
 
 	securityContext := config.GetLinux().GetSecurityContext()
 	selinuxOpt := securityContext.GetSelinuxOptions()

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,8 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP`
`341`	`341`	`for _, e := range config.GetEnvs() {`
`342`	`342`	`g.AddProcessEnv(e.GetKey(), e.GetValue())`
`343`	`343`	`}`
	`344`	`+ // add the HOSTNAME variable to the environment to match Docker runtime default`
	`345`	`+ g.AddProcessEnv("HOSTNAME", sandboxConfig.GetHostname())`
`344`	`346`
`345`	`347`	`securityContext := config.GetLinux().GetSecurityContext()`
`346`	`348`	`selinuxOpt := securityContext.GetSelinuxOptions()`