mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
bc8eabce25
Fix issue where environment variables with embedded equals signs were being dropped and not passed to the container. Fixes #26178. Signed-off-by: Matt Richardson <matt.richardson@octopus.com>
37 lines
872 B
Go
37 lines
872 B
Go
package libcontainerd
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// setupEnvironmentVariables converts a string array of environment variables
|
|
// into a map as required by the HCS. Source array is in format [v1=k1] [v2=k2] etc.
|
|
func setupEnvironmentVariables(a []string) map[string]string {
|
|
r := make(map[string]string)
|
|
for _, s := range a {
|
|
arr := strings.SplitN(s, "=", 2)
|
|
if len(arr) == 2 {
|
|
r[arr[0]] = arr[1]
|
|
}
|
|
}
|
|
return r
|
|
}
|
|
|
|
// Apply for a servicing option is a no-op.
|
|
func (s *ServicingOption) Apply(interface{}) error {
|
|
return nil
|
|
}
|
|
|
|
// buildFromVersion takes an image version string and returns the Windows build
|
|
// number. It returns 0 if the build number is not present.
|
|
func buildFromVersion(osver string) int {
|
|
v := strings.Split(osver, ".")
|
|
if len(v) < 3 {
|
|
return 0
|
|
}
|
|
if build, err := strconv.Atoi(v[2]); err == nil {
|
|
return build
|
|
}
|
|
return 0
|
|
}
|