Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli: Preserve order of environment variables 

Unless we are adding or removing environment variables, their order
shouldn't be changed. This makes it look like the service's TaskSpec has
changed relative to the old version of the service, and containers need
to be redeployed.

The existing code always rebuilds the list of environment variables by
converting them to a map and back, but there's no reason to do this if
no environment variables are being added.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2017-04-04 18:16:57 -07:00
parent 9a5513b791
commit 71d1b0507e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
command/service/update.go
View File

@ -524,21 +524,22 @@ func updateLabels(flags *pflag.FlagSet, field *map[string]string) {
} }
func updateEnvironment(flags *pflag.FlagSet, field *[]string) { func updateEnvironment(flags *pflag.FlagSet, field *[]string) {
if flags.Changed(flagEnvAdd) {
envSet := map[string]string{} envSet := map[string]string{}
for _, v := range *field { for _, v := range *field {
envSet[envKey(v)] = v envSet[envKey(v)] = v
} }
if flags.Changed(flagEnvAdd) {
value := flags.Lookup(flagEnvAdd).Value.(*opts.ListOpts) value := flags.Lookup(flagEnvAdd).Value.(*opts.ListOpts)
for _, v := range value.GetAll() { for _, v := range value.GetAll() {
envSet[envKey(v)] = v envSet[envKey(v)] = v
} }
}
*field = []string{} *field = []string{}
for _, v := range envSet { for _, v := range envSet {
*field = append(*field, v) *field = append(*field, v)
} }
}
toRemove := buildToRemoveSet(flags, flagEnvRemove) toRemove := buildToRemoveSet(flags, flagEnvRemove)
*field = removeItems(*field, toRemove, envKey) *field = removeItems(*field, toRemove, envKey)