From d1247855c939f861f454dbd0b71935f2f291e79c Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Wed, 7 Feb 2018 01:07:09 +0200 Subject: [PATCH] Fix rolling upgrade issue for nginx proxy --- docker/docker.go | 3 +-- services/proxy.go | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker.go b/docker/docker.go index 1a29602c..10f0dd67 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -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 } diff --git a/services/proxy.go b/services/proxy.go index 2bc79b9d..9befd355 100644 --- a/services/proxy.go +++ b/services/proxy.go @@ -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",