rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-07 18:04:19 +00:00
Code Issues Releases Wiki Activity

Fix rolling upgrade issue for nginx proxy

Browse Source
This commit is contained in:
galal-hussein 2018-02-07 01:07:09 +02:00
parent ecd9395d21
commit d1247855c9
2 changed files with 2 additions and 2 deletions
Show Stats 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 return false, err
} }
if containerInspect.Config.Image != imageCfg.Image || if containerInspect.Config.Image != imageCfg.Image ||
!reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) || !reflect.DeepEqual(containerInspect.Config.Cmd, imageCfg.Cmd) {
!reflect.DeepEqual(containerInspect.Config.Env, imageCfg.Env) {
logrus.Debugf("[%s] Container [%s] is eligible for updgrade on host [%s]", plane, containerName, hostname) logrus.Debugf("[%s] Container [%s] is eligible for updgrade on host [%s]", plane, containerName, hostname)
return true, nil return true, nil
} }

1
services/proxy.go
View File

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