rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 07:30:01 +00:00
Code Issues Releases Wiki Activity

Merge pull request #326 from galal-hussein/fix_rolling_upgrade

Browse Source 
Fix rolling upgrade issue for nginx proxy
This commit is contained in:
Alena Prokharchyk
2018-02-06 15:56:18 -08:00
committed by GitHub
parent ecd9395d21 d1247855c9
commit 96d01ca95d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker.go
View File

@@ -294,8 +294,7 @@ func IsContainerUpgradable(ctx context.Context, dClient *client.Client, imageCfg
return false, err
}
if containerInspect.Config.Image != imageCfg.Image ||
!reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) ||
!reflect.DeepEqual(containerInspect.Config.Env, imageCfg.Env) {
!reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) {
logrus.Debugf("[%s] Container [%s] is eligible for updgrade on host [%s]", plane, containerName, hostname)
return true, nil
}

1
services/proxy.go
View File

@@ -40,6 +40,7 @@ func buildNginxProxyConfig(host *hosts.Host, nginxProxyEnv, nginxProxyImage stri
imageCfg := &container.Config{
Image: nginxProxyImage,
Env: []string{fmt.Sprintf("%s=%s", NginxProxyEnvName, nginxProxyEnv)},
Cmd: []string{fmt.Sprintf("%s=%s", NginxProxyEnvName, nginxProxyEnv)},
}
hostCfg := &container.HostConfig{
NetworkMode: "host",