зеркало из https://github.com/microsoft/docker.git
Fix issue within mergeConfig preventing hostname and user to be set
This commit is contained in:
Родитель
1617a18258
Коммит
8378498951
|
@ -80,10 +80,10 @@ func (runtime *Runtime) containerRoot(id string) string {
|
|||
}
|
||||
|
||||
func (runtime *Runtime) mergeConfig(userConf, imageConf *Config) {
|
||||
if userConf.Hostname != "" {
|
||||
if userConf.Hostname == "" {
|
||||
userConf.Hostname = imageConf.Hostname
|
||||
}
|
||||
if userConf.User != "" {
|
||||
if userConf.User == "" {
|
||||
userConf.User = imageConf.User
|
||||
}
|
||||
if userConf.Memory == 0 {
|
||||
|
|
Загрузка…
Ссылка в новой задаче