2016-12-20 16:26:49 -05:00
|
|
|
package loader
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"path"
|
2017-05-27 15:29:30 -04:00
|
|
|
"path/filepath"
|
2016-12-20 16:26:49 -05:00
|
|
|
"reflect"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
|
2018-06-25 11:15:26 -04:00
|
|
|
interp "github.com/docker/cli/cli/compose/interpolation"
|
2017-04-17 18:07:56 -04:00
|
|
|
"github.com/docker/cli/cli/compose/schema"
|
|
|
|
"github.com/docker/cli/cli/compose/template"
|
|
|
|
"github.com/docker/cli/cli/compose/types"
|
2017-05-15 08:45:19 -04:00
|
|
|
"github.com/docker/cli/opts"
|
2017-11-06 17:03:43 -05:00
|
|
|
"github.com/docker/docker/api/types/versions"
|
2017-01-31 15:45:45 -05:00
|
|
|
"github.com/docker/go-connections/nat"
|
2016-12-20 16:26:49 -05:00
|
|
|
units "github.com/docker/go-units"
|
|
|
|
shellwords "github.com/mattn/go-shellwords"
|
|
|
|
"github.com/mitchellh/mapstructure"
|
2017-03-24 12:24:58 -04:00
|
|
|
"github.com/pkg/errors"
|
2017-08-07 05:52:40 -04:00
|
|
|
"github.com/sirupsen/logrus"
|
2016-12-20 16:26:49 -05:00
|
|
|
yaml "gopkg.in/yaml.v2"
|
|
|
|
)
|
|
|
|
|
2018-06-25 11:15:26 -04:00
|
|
|
// Options supported by Load
|
|
|
|
type Options struct {
|
|
|
|
// Skip schema validation
|
|
|
|
SkipValidation bool
|
|
|
|
// Skip interpolation
|
|
|
|
SkipInterpolation bool
|
|
|
|
// Interpolation options
|
|
|
|
Interpolate *interp.Options
|
|
|
|
}
|
|
|
|
|
2016-12-20 16:26:49 -05:00
|
|
|
// ParseYAML reads the bytes from a file, parses the bytes into a mapping
|
|
|
|
// structure, and returns it.
|
2017-03-22 10:42:03 -04:00
|
|
|
func ParseYAML(source []byte) (map[string]interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
var cfg interface{}
|
|
|
|
if err := yaml.Unmarshal(source, &cfg); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
cfgMap, ok := cfg.(map[interface{}]interface{})
|
|
|
|
if !ok {
|
2017-03-09 13:23:45 -05:00
|
|
|
return nil, errors.Errorf("Top-level object must be a mapping")
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
converted, err := convertToStringKeysRecursive(cfgMap, "")
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-03-22 10:42:03 -04:00
|
|
|
return converted.(map[string]interface{}), nil
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Load reads a ConfigDetails and returns a fully loaded configuration
|
2018-06-25 11:15:26 -04:00
|
|
|
func Load(configDetails types.ConfigDetails, options ...func(*Options)) (*types.Config, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
if len(configDetails.ConfigFiles) < 1 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return nil, errors.Errorf("No files specified")
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2018-06-25 11:15:26 -04:00
|
|
|
opts := &Options{
|
|
|
|
Interpolate: &interp.Options{
|
|
|
|
Substitute: template.Substitute,
|
|
|
|
LookupValue: configDetails.LookupEnv,
|
|
|
|
TypeCastMapping: interpolateTypeCastMapping,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, op := range options {
|
|
|
|
op(opts)
|
|
|
|
}
|
|
|
|
|
2017-09-29 08:21:40 -04:00
|
|
|
configs := []*types.Config{}
|
2018-06-25 11:15:26 -04:00
|
|
|
var err error
|
2016-12-20 16:26:49 -05:00
|
|
|
|
2017-09-29 08:21:40 -04:00
|
|
|
for _, file := range configDetails.ConfigFiles {
|
|
|
|
configDict := file.Config
|
|
|
|
version := schema.Version(configDict)
|
|
|
|
if configDetails.Version == "" {
|
|
|
|
configDetails.Version = version
|
|
|
|
}
|
|
|
|
if configDetails.Version != version {
|
|
|
|
return nil, errors.Errorf("version mismatched between two composefiles : %v and %v", configDetails.Version, version)
|
|
|
|
}
|
2016-12-20 16:26:49 -05:00
|
|
|
|
2017-09-29 08:21:40 -04:00
|
|
|
if err := validateForbidden(configDict); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2016-12-20 16:26:49 -05:00
|
|
|
|
2018-06-25 11:15:26 -04:00
|
|
|
if !opts.SkipInterpolation {
|
|
|
|
configDict, err = interpolateConfig(configDict, *opts.Interpolate)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-09-29 08:21:40 -04:00
|
|
|
}
|
|
|
|
|
2018-06-25 11:15:26 -04:00
|
|
|
if !opts.SkipValidation {
|
|
|
|
if err := schema.Validate(configDict, configDetails.Version); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-09-29 08:21:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
cfg, err := loadSections(configDict, configDetails)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
cfg.Filename = file.Filename
|
|
|
|
|
|
|
|
configs = append(configs, cfg)
|
2017-10-03 18:03:20 -04:00
|
|
|
}
|
2017-09-29 08:21:40 -04:00
|
|
|
|
|
|
|
return merge(configs)
|
2017-05-15 11:19:32 -04:00
|
|
|
}
|
2016-12-20 16:26:49 -05:00
|
|
|
|
2017-10-03 18:03:20 -04:00
|
|
|
func validateForbidden(configDict map[string]interface{}) error {
|
|
|
|
servicesDict, ok := configDict["services"].(map[string]interface{})
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
forbidden := getProperties(servicesDict, types.ForbiddenProperties)
|
|
|
|
if len(forbidden) > 0 {
|
|
|
|
return &ForbiddenPropertiesError{Properties: forbidden}
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
2017-10-03 18:03:20 -04:00
|
|
|
return nil
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-10-04 16:51:48 -04:00
|
|
|
func loadSections(config map[string]interface{}, configDetails types.ConfigDetails) (*types.Config, error) {
|
|
|
|
var err error
|
2018-02-21 12:31:52 -05:00
|
|
|
cfg := types.Config{
|
|
|
|
Version: schema.Version(config),
|
|
|
|
}
|
2017-10-04 16:51:48 -04:00
|
|
|
|
|
|
|
var loaders = []struct {
|
|
|
|
key string
|
|
|
|
fnc func(config map[string]interface{}) error
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
key: "services",
|
|
|
|
fnc: func(config map[string]interface{}) error {
|
|
|
|
cfg.Services, err = LoadServices(config, configDetails.WorkingDir, configDetails.LookupEnv)
|
|
|
|
return err
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
key: "networks",
|
|
|
|
fnc: func(config map[string]interface{}) error {
|
2017-11-22 14:21:32 -05:00
|
|
|
cfg.Networks, err = LoadNetworks(config, configDetails.Version)
|
2017-10-04 16:51:48 -04:00
|
|
|
return err
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
key: "volumes",
|
|
|
|
fnc: func(config map[string]interface{}) error {
|
2017-11-06 17:03:43 -05:00
|
|
|
cfg.Volumes, err = LoadVolumes(config, configDetails.Version)
|
2017-10-04 16:51:48 -04:00
|
|
|
return err
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
key: "secrets",
|
|
|
|
fnc: func(config map[string]interface{}) error {
|
2017-11-06 17:30:10 -05:00
|
|
|
cfg.Secrets, err = LoadSecrets(config, configDetails)
|
2017-10-04 16:51:48 -04:00
|
|
|
return err
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
key: "configs",
|
|
|
|
fnc: func(config map[string]interface{}) error {
|
2017-11-06 17:30:10 -05:00
|
|
|
cfg.Configs, err = LoadConfigObjs(config, configDetails)
|
2017-10-04 16:51:48 -04:00
|
|
|
return err
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, loader := range loaders {
|
|
|
|
if err := loader.fnc(getSection(config, loader.key)); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
cfg.Extras = getExtras(config)
|
2017-10-04 16:51:48 -04:00
|
|
|
return &cfg, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getSection(config map[string]interface{}, key string) map[string]interface{} {
|
|
|
|
section, ok := config[key]
|
|
|
|
if !ok {
|
|
|
|
return make(map[string]interface{})
|
|
|
|
}
|
|
|
|
return section.(map[string]interface{})
|
|
|
|
}
|
|
|
|
|
2016-12-20 16:26:49 -05:00
|
|
|
// GetUnsupportedProperties returns the list of any unsupported properties that are
|
|
|
|
// used in the Compose files.
|
2017-09-29 08:21:40 -04:00
|
|
|
func GetUnsupportedProperties(configDicts ...map[string]interface{}) []string {
|
2016-12-20 16:26:49 -05:00
|
|
|
unsupported := map[string]bool{}
|
|
|
|
|
2017-09-29 08:21:40 -04:00
|
|
|
for _, configDict := range configDicts {
|
|
|
|
for _, service := range getServices(configDict) {
|
|
|
|
serviceDict := service.(map[string]interface{})
|
|
|
|
for _, property := range types.UnsupportedProperties {
|
|
|
|
if _, isSet := serviceDict[property]; isSet {
|
|
|
|
unsupported[property] = true
|
|
|
|
}
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return sortedKeys(unsupported)
|
|
|
|
}
|
|
|
|
|
|
|
|
func sortedKeys(set map[string]bool) []string {
|
|
|
|
var keys []string
|
|
|
|
for key := range set {
|
|
|
|
keys = append(keys, key)
|
|
|
|
}
|
|
|
|
sort.Strings(keys)
|
|
|
|
return keys
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDeprecatedProperties returns the list of any deprecated properties that
|
|
|
|
// are used in the compose files.
|
2017-09-29 08:21:40 -04:00
|
|
|
func GetDeprecatedProperties(configDicts ...map[string]interface{}) map[string]string {
|
|
|
|
deprecated := map[string]string{}
|
|
|
|
|
|
|
|
for _, configDict := range configDicts {
|
|
|
|
deprecatedProperties := getProperties(getServices(configDict), types.DeprecatedProperties)
|
|
|
|
for key, value := range deprecatedProperties {
|
|
|
|
deprecated[key] = value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return deprecated
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-03-22 10:42:03 -04:00
|
|
|
func getProperties(services map[string]interface{}, propertyMap map[string]string) map[string]string {
|
2016-12-20 16:26:49 -05:00
|
|
|
output := map[string]string{}
|
|
|
|
|
|
|
|
for _, service := range services {
|
2017-03-22 10:42:03 -04:00
|
|
|
if serviceDict, ok := service.(map[string]interface{}); ok {
|
2016-12-20 16:26:49 -05:00
|
|
|
for property, description := range propertyMap {
|
|
|
|
if _, isSet := serviceDict[property]; isSet {
|
|
|
|
output[property] = description
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return output
|
|
|
|
}
|
|
|
|
|
|
|
|
// ForbiddenPropertiesError is returned when there are properties in the Compose
|
|
|
|
// file that are forbidden.
|
|
|
|
type ForbiddenPropertiesError struct {
|
|
|
|
Properties map[string]string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e *ForbiddenPropertiesError) Error() string {
|
|
|
|
return "Configuration contains forbidden properties"
|
|
|
|
}
|
|
|
|
|
2017-03-22 10:42:03 -04:00
|
|
|
func getServices(configDict map[string]interface{}) map[string]interface{} {
|
2016-12-20 16:26:49 -05:00
|
|
|
if services, ok := configDict["services"]; ok {
|
2017-03-22 10:42:03 -04:00
|
|
|
if servicesDict, ok := services.(map[string]interface{}); ok {
|
2016-12-20 16:26:49 -05:00
|
|
|
return servicesDict
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-22 10:42:03 -04:00
|
|
|
return map[string]interface{}{}
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
func transform(source map[string]interface{}, target interface{}) error {
|
|
|
|
data := mapstructure.Metadata{}
|
|
|
|
config := &mapstructure.DecoderConfig{
|
|
|
|
DecodeHook: mapstructure.ComposeDecodeHookFunc(
|
2017-06-01 15:22:09 -04:00
|
|
|
createTransformHook(),
|
2016-12-20 16:26:49 -05:00
|
|
|
mapstructure.StringToTimeDurationHookFunc()),
|
|
|
|
Result: target,
|
|
|
|
Metadata: &data,
|
|
|
|
}
|
|
|
|
decoder, err := mapstructure.NewDecoder(config)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2017-04-03 17:42:16 -04:00
|
|
|
return decoder.Decode(source)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-06-01 15:22:09 -04:00
|
|
|
func createTransformHook() mapstructure.DecodeHookFuncType {
|
|
|
|
transforms := map[reflect.Type]func(interface{}) (interface{}, error){
|
|
|
|
reflect.TypeOf(types.External{}): transformExternal,
|
|
|
|
reflect.TypeOf(types.HealthCheckTest{}): transformHealthCheckTest,
|
|
|
|
reflect.TypeOf(types.ShellCommand{}): transformShellCommand,
|
|
|
|
reflect.TypeOf(types.StringList{}): transformStringList,
|
|
|
|
reflect.TypeOf(map[string]string{}): transformMapStringString,
|
|
|
|
reflect.TypeOf(types.UlimitsConfig{}): transformUlimits,
|
|
|
|
reflect.TypeOf(types.UnitBytes(0)): transformSize,
|
|
|
|
reflect.TypeOf([]types.ServicePortConfig{}): transformServicePort,
|
|
|
|
reflect.TypeOf(types.ServiceSecretConfig{}): transformStringSourceMap,
|
|
|
|
reflect.TypeOf(types.ServiceConfigObjConfig{}): transformStringSourceMap,
|
|
|
|
reflect.TypeOf(types.StringOrNumberList{}): transformStringOrNumberList,
|
|
|
|
reflect.TypeOf(map[string]*types.ServiceNetworkConfig{}): transformServiceNetworkMap,
|
|
|
|
reflect.TypeOf(types.MappingWithEquals{}): transformMappingOrListFunc("=", true),
|
|
|
|
reflect.TypeOf(types.Labels{}): transformMappingOrListFunc("=", false),
|
|
|
|
reflect.TypeOf(types.MappingWithColon{}): transformMappingOrListFunc(":", false),
|
Preserve sort-order of extra hosts, and allow duplicate entries
Extra hosts (`extra_hosts` in compose-file, or `--hosts` in services) adds
custom host/ip mappings to the container's `/etc/hosts`.
The current implementation used a `map[string]string{}` as intermediate
storage, and sorted the results alphabetically when converting to a service-spec.
As a result, duplicate hosts were removed, and order of host/ip mappings was not
preserved (in case the compose-file used a list instead of a map).
According to the **host.conf(5)** man page (http://man7.org/linux/man-pages/man5/host.conf.5.html)
multi Valid values are on and off. If set to on, the resolver
library will return all valid addresses for a host that
appears in the /etc/hosts file, instead of only the first.
This is off by default, as it may cause a substantial
performance loss at sites with large hosts files.
Multiple entries for a host are allowed, and even required for some situations,
for example, to add mappings for IPv4 and IPv6 addreses for a host, as illustrated
by the example hosts file in the **hosts(5)** man page (http://man7.org/linux/man-pages/man5/hosts.5.html):
# The following lines are desirable for IPv4 capable hosts
127.0.0.1 localhost
# 127.0.1.1 is often used for the FQDN of the machine
127.0.1.1 thishost.mydomain.org thishost
192.168.1.10 foo.mydomain.org foo
192.168.1.13 bar.mydomain.org bar
146.82.138.7 master.debian.org master
209.237.226.90 www.opensource.org
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
This patch changes the intermediate storage format to use a `[]string`, and only
sorts entries if the input format in the compose file is a mapping. If the input
format is a list, the original sort-order is preserved.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-29 20:33:23 -04:00
|
|
|
reflect.TypeOf(types.HostsList{}): transformListOrMappingFunc(":", false),
|
2017-06-01 15:22:09 -04:00
|
|
|
reflect.TypeOf(types.ServiceVolumeConfig{}): transformServiceVolumeConfig,
|
2017-09-20 05:42:08 -04:00
|
|
|
reflect.TypeOf(types.BuildConfig{}): transformBuildConfig,
|
2017-06-01 15:22:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return func(_ reflect.Type, target reflect.Type, data interface{}) (interface{}, error) {
|
|
|
|
transform, ok := transforms[target]
|
|
|
|
if !ok {
|
|
|
|
return data, nil
|
|
|
|
}
|
|
|
|
return transform(data)
|
|
|
|
}
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// keys needs to be converted to strings for jsonschema
|
|
|
|
func convertToStringKeysRecursive(value interface{}, keyPrefix string) (interface{}, error) {
|
|
|
|
if mapping, ok := value.(map[interface{}]interface{}); ok {
|
2017-03-22 10:42:03 -04:00
|
|
|
dict := make(map[string]interface{})
|
2016-12-20 16:26:49 -05:00
|
|
|
for key, entry := range mapping {
|
|
|
|
str, ok := key.(string)
|
|
|
|
if !ok {
|
2017-01-18 15:27:02 -05:00
|
|
|
return nil, formatInvalidKeyError(keyPrefix, key)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
var newKeyPrefix string
|
|
|
|
if keyPrefix == "" {
|
|
|
|
newKeyPrefix = str
|
|
|
|
} else {
|
|
|
|
newKeyPrefix = fmt.Sprintf("%s.%s", keyPrefix, str)
|
|
|
|
}
|
|
|
|
convertedEntry, err := convertToStringKeysRecursive(entry, newKeyPrefix)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
dict[str] = convertedEntry
|
|
|
|
}
|
|
|
|
return dict, nil
|
|
|
|
}
|
|
|
|
if list, ok := value.([]interface{}); ok {
|
|
|
|
var convertedList []interface{}
|
|
|
|
for index, entry := range list {
|
|
|
|
newKeyPrefix := fmt.Sprintf("%s[%d]", keyPrefix, index)
|
|
|
|
convertedEntry, err := convertToStringKeysRecursive(entry, newKeyPrefix)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
convertedList = append(convertedList, convertedEntry)
|
|
|
|
}
|
|
|
|
return convertedList, nil
|
|
|
|
}
|
|
|
|
return value, nil
|
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func formatInvalidKeyError(keyPrefix string, key interface{}) error {
|
|
|
|
var location string
|
|
|
|
if keyPrefix == "" {
|
|
|
|
location = "at top level"
|
|
|
|
} else {
|
|
|
|
location = fmt.Sprintf("in %s", keyPrefix)
|
|
|
|
}
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("Non-string key %s: %#v", location, key)
|
2017-01-18 15:27:02 -05:00
|
|
|
}
|
|
|
|
|
2017-03-01 03:52:00 -05:00
|
|
|
// LoadServices produces a ServiceConfig map from a compose file Dict
|
|
|
|
// the servicesDict is not validated if directly used. Use Load() to enable validation
|
2017-03-22 10:42:03 -04:00
|
|
|
func LoadServices(servicesDict map[string]interface{}, workingDir string, lookupEnv template.Mapping) ([]types.ServiceConfig, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
var services []types.ServiceConfig
|
|
|
|
|
|
|
|
for name, serviceDef := range servicesDict {
|
2017-03-22 10:42:03 -04:00
|
|
|
serviceConfig, err := LoadService(name, serviceDef.(map[string]interface{}), workingDir, lookupEnv)
|
2016-12-20 16:26:49 -05:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
services = append(services, *serviceConfig)
|
|
|
|
}
|
|
|
|
|
|
|
|
return services, nil
|
|
|
|
}
|
|
|
|
|
2017-03-01 03:52:00 -05:00
|
|
|
// LoadService produces a single ServiceConfig from a compose file Dict
|
|
|
|
// the serviceDict is not validated if directly used. Use Load() to enable validation
|
2017-03-22 10:42:03 -04:00
|
|
|
func LoadService(name string, serviceDict map[string]interface{}, workingDir string, lookupEnv template.Mapping) (*types.ServiceConfig, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
serviceConfig := &types.ServiceConfig{}
|
|
|
|
if err := transform(serviceDict, serviceConfig); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
serviceConfig.Name = name
|
|
|
|
|
2017-02-07 04:44:47 -05:00
|
|
|
if err := resolveEnvironment(serviceConfig, workingDir, lookupEnv); err != nil {
|
2016-12-20 16:26:49 -05:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2018-01-21 00:22:19 -05:00
|
|
|
if err := resolveVolumePaths(serviceConfig.Volumes, workingDir, lookupEnv); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
|
|
|
|
serviceConfig.Extras = getExtras(serviceDict)
|
|
|
|
|
2016-12-20 16:26:49 -05:00
|
|
|
return serviceConfig, nil
|
|
|
|
}
|
|
|
|
|
2018-06-25 04:51:56 -04:00
|
|
|
func loadExtras(name string, source map[string]interface{}) map[string]interface{} {
|
|
|
|
if dict, ok := source[name].(map[string]interface{}); ok {
|
|
|
|
return getExtras(dict)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getExtras(dict map[string]interface{}) map[string]interface{} {
|
|
|
|
extras := map[string]interface{}{}
|
|
|
|
for key, value := range dict {
|
|
|
|
if strings.HasPrefix(key, "x-") {
|
|
|
|
extras[key] = value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(extras) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return extras
|
|
|
|
}
|
|
|
|
|
2017-03-14 12:39:26 -04:00
|
|
|
func updateEnvironment(environment map[string]*string, vars map[string]*string, lookupEnv template.Mapping) {
|
2017-02-07 04:44:47 -05:00
|
|
|
for k, v := range vars {
|
|
|
|
interpolatedV, ok := lookupEnv(k)
|
2017-03-14 12:39:26 -04:00
|
|
|
if (v == nil || *v == "") && ok {
|
2017-02-07 04:44:47 -05:00
|
|
|
// lookupEnv is prioritized over vars
|
2017-03-14 12:39:26 -04:00
|
|
|
environment[k] = &interpolatedV
|
2017-02-07 04:44:47 -05:00
|
|
|
} else {
|
2017-03-14 12:39:26 -04:00
|
|
|
environment[k] = v
|
2017-02-07 04:44:47 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func resolveEnvironment(serviceConfig *types.ServiceConfig, workingDir string, lookupEnv template.Mapping) error {
|
2017-03-14 12:39:26 -04:00
|
|
|
environment := make(map[string]*string)
|
2016-12-20 16:26:49 -05:00
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
if len(serviceConfig.EnvFile) > 0 {
|
2016-12-20 16:26:49 -05:00
|
|
|
var envVars []string
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
for _, file := range serviceConfig.EnvFile {
|
2017-01-10 17:40:53 -05:00
|
|
|
filePath := absPath(workingDir, file)
|
2017-06-05 18:23:21 -04:00
|
|
|
fileVars, err := opts.ParseEnvFile(filePath)
|
2016-12-20 16:26:49 -05:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
envVars = append(envVars, fileVars...)
|
|
|
|
}
|
2017-03-14 12:39:26 -04:00
|
|
|
updateEnvironment(environment,
|
2017-06-05 18:23:21 -04:00
|
|
|
opts.ConvertKVStringsToMapWithNil(envVars), lookupEnv)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-03-14 12:39:26 -04:00
|
|
|
updateEnvironment(environment, serviceConfig.Environment, lookupEnv)
|
|
|
|
serviceConfig.Environment = environment
|
2016-12-20 16:26:49 -05:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-01-21 00:22:19 -05:00
|
|
|
func resolveVolumePaths(volumes []types.ServiceVolumeConfig, workingDir string, lookupEnv template.Mapping) error {
|
2017-01-24 12:09:53 -05:00
|
|
|
for i, volume := range volumes {
|
|
|
|
if volume.Type != "bind" {
|
2016-12-20 16:26:49 -05:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2018-01-21 00:22:19 -05:00
|
|
|
if volume.Source == "" {
|
|
|
|
return errors.New(`invalid mount config for type "bind": field Source must not be empty`)
|
|
|
|
}
|
|
|
|
|
2017-05-27 15:29:30 -04:00
|
|
|
filePath := expandUser(volume.Source, lookupEnv)
|
|
|
|
// Check for a Unix absolute path first, to handle a Windows client
|
|
|
|
// with a Unix daemon. This handles a Windows client connecting to a
|
|
|
|
// Unix daemon. Note that this is not required for Docker for Windows
|
|
|
|
// when specifying a local Windows path, because Docker for Windows
|
|
|
|
// translates the Windows path into a valid path within the VM.
|
|
|
|
if !path.IsAbs(filePath) {
|
|
|
|
filePath = absPath(workingDir, filePath)
|
|
|
|
}
|
|
|
|
volume.Source = filePath
|
2017-01-24 12:09:53 -05:00
|
|
|
volumes[i] = volume
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
2018-01-21 00:22:19 -05:00
|
|
|
return nil
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: make this more robust
|
2017-02-07 04:44:47 -05:00
|
|
|
func expandUser(path string, lookupEnv template.Mapping) string {
|
2016-12-20 16:26:49 -05:00
|
|
|
if strings.HasPrefix(path, "~") {
|
2017-02-07 04:44:47 -05:00
|
|
|
home, ok := lookupEnv("HOME")
|
|
|
|
if !ok {
|
|
|
|
logrus.Warn("cannot expand '~', because the environment lacks HOME")
|
|
|
|
return path
|
|
|
|
}
|
|
|
|
return strings.Replace(path, "~", home, 1)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
return path
|
|
|
|
}
|
|
|
|
|
2017-01-10 17:40:53 -05:00
|
|
|
func transformUlimits(data interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
switch value := data.(type) {
|
|
|
|
case int:
|
|
|
|
return types.UlimitsConfig{Single: value}, nil
|
2017-03-22 10:42:03 -04:00
|
|
|
case map[string]interface{}:
|
2016-12-20 16:26:49 -05:00
|
|
|
ulimit := types.UlimitsConfig{}
|
|
|
|
ulimit.Soft = value["soft"].(int)
|
|
|
|
ulimit.Hard = value["hard"].(int)
|
|
|
|
return ulimit, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for ulimits", value)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-01 03:52:00 -05:00
|
|
|
// LoadNetworks produces a NetworkConfig map from a compose file Dict
|
|
|
|
// the source Dict is not validated if directly used. Use Load() to enable validation
|
2017-11-22 14:21:32 -05:00
|
|
|
func LoadNetworks(source map[string]interface{}, version string) (map[string]types.NetworkConfig, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
networks := make(map[string]types.NetworkConfig)
|
|
|
|
err := transform(source, &networks)
|
|
|
|
if err != nil {
|
|
|
|
return networks, err
|
|
|
|
}
|
|
|
|
for name, network := range networks {
|
2017-11-22 14:21:32 -05:00
|
|
|
if !network.External.External {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
switch {
|
|
|
|
case network.External.Name != "":
|
|
|
|
if network.Name != "" {
|
|
|
|
return nil, errors.Errorf("network %s: network.external.name and network.name conflict; only use network.name", name)
|
|
|
|
}
|
|
|
|
if versions.GreaterThanOrEqualTo(version, "3.5") {
|
|
|
|
logrus.Warnf("network %s: network.external.name is deprecated in favor of network.name", name)
|
|
|
|
}
|
|
|
|
network.Name = network.External.Name
|
|
|
|
network.External.Name = ""
|
|
|
|
case network.Name == "":
|
|
|
|
network.Name = name
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
network.Extras = loadExtras(name, source)
|
2017-11-22 14:21:32 -05:00
|
|
|
networks[name] = network
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
return networks, nil
|
|
|
|
}
|
|
|
|
|
2017-03-24 12:24:58 -04:00
|
|
|
func externalVolumeError(volume, key string) error {
|
|
|
|
return errors.Errorf(
|
|
|
|
"conflicting parameters \"external\" and %q specified for volume %q",
|
|
|
|
key, volume)
|
|
|
|
}
|
|
|
|
|
2017-03-01 03:52:00 -05:00
|
|
|
// LoadVolumes produces a VolumeConfig map from a compose file Dict
|
|
|
|
// the source Dict is not validated if directly used. Use Load() to enable validation
|
2017-11-06 17:03:43 -05:00
|
|
|
func LoadVolumes(source map[string]interface{}, version string) (map[string]types.VolumeConfig, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
volumes := make(map[string]types.VolumeConfig)
|
2017-11-06 17:03:43 -05:00
|
|
|
if err := transform(source, &volumes); err != nil {
|
2016-12-20 16:26:49 -05:00
|
|
|
return volumes, err
|
|
|
|
}
|
2017-11-06 17:03:43 -05:00
|
|
|
|
2016-12-20 16:26:49 -05:00
|
|
|
for name, volume := range volumes {
|
2017-11-06 17:03:43 -05:00
|
|
|
if !volume.External.External {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
switch {
|
|
|
|
case volume.Driver != "":
|
|
|
|
return nil, externalVolumeError(name, "driver")
|
|
|
|
case len(volume.DriverOpts) > 0:
|
|
|
|
return nil, externalVolumeError(name, "driver_opts")
|
|
|
|
case len(volume.Labels) > 0:
|
|
|
|
return nil, externalVolumeError(name, "labels")
|
|
|
|
case volume.External.Name != "":
|
|
|
|
if volume.Name != "" {
|
|
|
|
return nil, errors.Errorf("volume %s: volume.external.name and volume.name conflict; only use volume.name", name)
|
2017-02-20 01:12:36 -05:00
|
|
|
}
|
2017-11-06 17:03:43 -05:00
|
|
|
if versions.GreaterThanOrEqualTo(version, "3.4") {
|
2017-06-29 19:25:50 -04:00
|
|
|
logrus.Warnf("volume %s: volume.external.name is deprecated in favor of volume.name", name)
|
2017-02-20 01:12:36 -05:00
|
|
|
}
|
2017-11-06 17:03:43 -05:00
|
|
|
volume.Name = volume.External.Name
|
|
|
|
volume.External.Name = ""
|
|
|
|
case volume.Name == "":
|
|
|
|
volume.Name = name
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
volume.Extras = loadExtras(name, source)
|
2017-11-06 17:03:43 -05:00
|
|
|
volumes[name] = volume
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
return volumes, nil
|
|
|
|
}
|
|
|
|
|
2017-03-01 03:52:00 -05:00
|
|
|
// LoadSecrets produces a SecretConfig map from a compose file Dict
|
|
|
|
// the source Dict is not validated if directly used. Use Load() to enable validation
|
2017-11-06 17:30:10 -05:00
|
|
|
func LoadSecrets(source map[string]interface{}, details types.ConfigDetails) (map[string]types.SecretConfig, error) {
|
2017-01-10 17:40:53 -05:00
|
|
|
secrets := make(map[string]types.SecretConfig)
|
2017-01-18 13:06:36 -05:00
|
|
|
if err := transform(source, &secrets); err != nil {
|
2017-01-10 17:40:53 -05:00
|
|
|
return secrets, err
|
|
|
|
}
|
|
|
|
for name, secret := range secrets {
|
2017-11-22 06:18:05 -05:00
|
|
|
obj, err := loadFileObjectConfig(name, "secret", types.FileObjectConfig(secret), details)
|
2017-11-06 17:30:10 -05:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
secretConfig := types.SecretConfig(obj)
|
|
|
|
secretConfig.Extras = loadExtras(name, source)
|
|
|
|
secrets[name] = secretConfig
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
|
|
|
return secrets, nil
|
|
|
|
}
|
|
|
|
|
2017-05-15 11:19:32 -04:00
|
|
|
// LoadConfigObjs produces a ConfigObjConfig map from a compose file Dict
|
|
|
|
// the source Dict is not validated if directly used. Use Load() to enable validation
|
2017-11-06 17:30:10 -05:00
|
|
|
func LoadConfigObjs(source map[string]interface{}, details types.ConfigDetails) (map[string]types.ConfigObjConfig, error) {
|
2017-05-15 11:19:32 -04:00
|
|
|
configs := make(map[string]types.ConfigObjConfig)
|
|
|
|
if err := transform(source, &configs); err != nil {
|
|
|
|
return configs, err
|
|
|
|
}
|
|
|
|
for name, config := range configs {
|
2017-11-22 06:18:05 -05:00
|
|
|
obj, err := loadFileObjectConfig(name, "config", types.FileObjectConfig(config), details)
|
2017-11-06 17:30:10 -05:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2017-05-15 11:19:32 -04:00
|
|
|
}
|
2018-06-25 04:51:56 -04:00
|
|
|
configConfig := types.ConfigObjConfig(obj)
|
|
|
|
configConfig.Extras = loadExtras(name, source)
|
|
|
|
configs[name] = configConfig
|
2017-05-15 11:19:32 -04:00
|
|
|
}
|
|
|
|
return configs, nil
|
|
|
|
}
|
|
|
|
|
2017-11-22 06:18:05 -05:00
|
|
|
func loadFileObjectConfig(name string, objType string, obj types.FileObjectConfig, details types.ConfigDetails) (types.FileObjectConfig, error) {
|
|
|
|
// if "external: true"
|
|
|
|
if obj.External.External {
|
|
|
|
// handle deprecated external.name
|
|
|
|
if obj.External.Name != "" {
|
|
|
|
if obj.Name != "" {
|
|
|
|
return obj, errors.Errorf("%[1]s %[2]s: %[1]s.external.name and %[1]s.name conflict; only use %[1]s.name", objType, name)
|
|
|
|
}
|
|
|
|
if versions.GreaterThanOrEqualTo(details.Version, "3.5") {
|
|
|
|
logrus.Warnf("%[1]s %[2]s: %[1]s.external.name is deprecated in favor of %[1]s.name", objType, name)
|
|
|
|
}
|
|
|
|
obj.Name = obj.External.Name
|
|
|
|
obj.External.Name = ""
|
|
|
|
} else {
|
|
|
|
if obj.Name == "" {
|
|
|
|
obj.Name = name
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// if not "external: true"
|
|
|
|
} else {
|
2017-11-06 17:30:10 -05:00
|
|
|
obj.File = absPath(details.WorkingDir, obj.File)
|
|
|
|
}
|
2017-11-22 06:18:05 -05:00
|
|
|
|
2017-11-06 17:30:10 -05:00
|
|
|
return obj, nil
|
|
|
|
}
|
|
|
|
|
2017-05-27 15:29:30 -04:00
|
|
|
func absPath(workingDir string, filePath string) string {
|
|
|
|
if filepath.IsAbs(filePath) {
|
|
|
|
return filePath
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
2017-05-27 15:29:30 -04:00
|
|
|
return filepath.Join(workingDir, filePath)
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformMapStringString(data interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
switch value := data.(type) {
|
|
|
|
case map[string]interface{}:
|
2017-03-14 12:39:26 -04:00
|
|
|
return toMapStringString(value, false), nil
|
2016-12-20 16:26:49 -05:00
|
|
|
case map[string]string:
|
|
|
|
return value, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for map[string]string", value)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-10 17:40:53 -05:00
|
|
|
func transformExternal(data interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
switch value := data.(type) {
|
|
|
|
case bool:
|
|
|
|
return map[string]interface{}{"external": value}, nil
|
|
|
|
case map[string]interface{}:
|
|
|
|
return map[string]interface{}{"external": true, "name": value["name"]}, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for external", value)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-31 15:45:45 -05:00
|
|
|
func transformServicePort(data interface{}) (interface{}, error) {
|
|
|
|
switch entries := data.(type) {
|
|
|
|
case []interface{}:
|
|
|
|
// We process the list instead of individual items here.
|
|
|
|
// The reason is that one entry might be mapped to multiple ServicePortConfig.
|
|
|
|
// Therefore we take an input of a list and return an output of a list.
|
|
|
|
ports := []interface{}{}
|
|
|
|
for _, entry := range entries {
|
|
|
|
switch value := entry.(type) {
|
|
|
|
case int:
|
|
|
|
v, err := toServicePortConfigs(fmt.Sprint(value))
|
|
|
|
if err != nil {
|
|
|
|
return data, err
|
|
|
|
}
|
|
|
|
ports = append(ports, v...)
|
|
|
|
case string:
|
|
|
|
v, err := toServicePortConfigs(value)
|
|
|
|
if err != nil {
|
|
|
|
return data, err
|
|
|
|
}
|
|
|
|
ports = append(ports, v...)
|
|
|
|
case map[string]interface{}:
|
|
|
|
ports = append(ports, value)
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for port", value)
|
2017-01-31 15:45:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ports, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for port", entries)
|
2017-01-31 15:45:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-15 11:19:32 -04:00
|
|
|
func transformStringSourceMap(data interface{}) (interface{}, error) {
|
2017-01-10 17:40:53 -05:00
|
|
|
switch value := data.(type) {
|
|
|
|
case string:
|
|
|
|
return map[string]interface{}{"source": value}, nil
|
|
|
|
case map[string]interface{}:
|
|
|
|
return data, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for secret", value)
|
2017-01-10 17:40:53 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-20 05:42:08 -04:00
|
|
|
func transformBuildConfig(data interface{}) (interface{}, error) {
|
|
|
|
switch value := data.(type) {
|
|
|
|
case string:
|
|
|
|
return map[string]interface{}{"context": value}, nil
|
|
|
|
case map[string]interface{}:
|
|
|
|
return data, nil
|
|
|
|
default:
|
|
|
|
return data, errors.Errorf("invalid type %T for service build", value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-24 12:09:53 -05:00
|
|
|
func transformServiceVolumeConfig(data interface{}) (interface{}, error) {
|
|
|
|
switch value := data.(type) {
|
|
|
|
case string:
|
2017-05-09 19:21:17 -04:00
|
|
|
return ParseVolume(value)
|
2017-01-24 12:09:53 -05:00
|
|
|
case map[string]interface{}:
|
|
|
|
return data, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for service volume", value)
|
2017-01-24 12:09:53 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformServiceNetworkMap(value interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
if list, ok := value.([]interface{}); ok {
|
|
|
|
mapValue := map[interface{}]interface{}{}
|
|
|
|
for _, name := range list {
|
|
|
|
mapValue[name] = nil
|
|
|
|
}
|
|
|
|
return mapValue, nil
|
|
|
|
}
|
|
|
|
return value, nil
|
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformStringOrNumberList(value interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
list := value.([]interface{})
|
|
|
|
result := make([]string, len(list))
|
|
|
|
for i, item := range list {
|
|
|
|
result[i] = fmt.Sprint(item)
|
|
|
|
}
|
2017-01-18 15:27:02 -05:00
|
|
|
return result, nil
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformStringList(data interface{}) (interface{}, error) {
|
|
|
|
switch value := data.(type) {
|
|
|
|
case string:
|
|
|
|
return []string{value}, nil
|
|
|
|
case []interface{}:
|
|
|
|
return value, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return data, errors.Errorf("invalid type %T for string list", value)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-01 15:22:09 -04:00
|
|
|
func transformMappingOrListFunc(sep string, allowNil bool) func(interface{}) (interface{}, error) {
|
|
|
|
return func(data interface{}) (interface{}, error) {
|
|
|
|
return transformMappingOrList(data, sep, allowNil), nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Preserve sort-order of extra hosts, and allow duplicate entries
Extra hosts (`extra_hosts` in compose-file, or `--hosts` in services) adds
custom host/ip mappings to the container's `/etc/hosts`.
The current implementation used a `map[string]string{}` as intermediate
storage, and sorted the results alphabetically when converting to a service-spec.
As a result, duplicate hosts were removed, and order of host/ip mappings was not
preserved (in case the compose-file used a list instead of a map).
According to the **host.conf(5)** man page (http://man7.org/linux/man-pages/man5/host.conf.5.html)
multi Valid values are on and off. If set to on, the resolver
library will return all valid addresses for a host that
appears in the /etc/hosts file, instead of only the first.
This is off by default, as it may cause a substantial
performance loss at sites with large hosts files.
Multiple entries for a host are allowed, and even required for some situations,
for example, to add mappings for IPv4 and IPv6 addreses for a host, as illustrated
by the example hosts file in the **hosts(5)** man page (http://man7.org/linux/man-pages/man5/hosts.5.html):
# The following lines are desirable for IPv4 capable hosts
127.0.0.1 localhost
# 127.0.1.1 is often used for the FQDN of the machine
127.0.1.1 thishost.mydomain.org thishost
192.168.1.10 foo.mydomain.org foo
192.168.1.13 bar.mydomain.org bar
146.82.138.7 master.debian.org master
209.237.226.90 www.opensource.org
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
This patch changes the intermediate storage format to use a `[]string`, and only
sorts entries if the input format in the compose file is a mapping. If the input
format is a list, the original sort-order is preserved.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-29 20:33:23 -04:00
|
|
|
func transformListOrMappingFunc(sep string, allowNil bool) func(interface{}) (interface{}, error) {
|
|
|
|
return func(data interface{}) (interface{}, error) {
|
|
|
|
return transformListOrMapping(data, sep, allowNil), nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func transformListOrMapping(listOrMapping interface{}, sep string, allowNil bool) interface{} {
|
|
|
|
switch value := listOrMapping.(type) {
|
|
|
|
case map[string]interface{}:
|
|
|
|
return toStringList(value, sep, allowNil)
|
|
|
|
case []interface{}:
|
|
|
|
return listOrMapping
|
|
|
|
}
|
|
|
|
panic(errors.Errorf("expected a map or a list, got %T: %#v", listOrMapping, listOrMapping))
|
|
|
|
}
|
|
|
|
|
2017-03-14 12:39:26 -04:00
|
|
|
func transformMappingOrList(mappingOrList interface{}, sep string, allowNil bool) interface{} {
|
|
|
|
switch value := mappingOrList.(type) {
|
2017-03-22 10:42:03 -04:00
|
|
|
case map[string]interface{}:
|
2017-03-14 12:39:26 -04:00
|
|
|
return toMapStringString(value, allowNil)
|
|
|
|
case ([]interface{}):
|
|
|
|
result := make(map[string]interface{})
|
|
|
|
for _, value := range value {
|
2016-12-20 16:26:49 -05:00
|
|
|
parts := strings.SplitN(value.(string), sep, 2)
|
2017-03-14 12:39:26 -04:00
|
|
|
key := parts[0]
|
|
|
|
switch {
|
|
|
|
case len(parts) == 1 && allowNil:
|
|
|
|
result[key] = nil
|
|
|
|
case len(parts) == 1 && !allowNil:
|
|
|
|
result[key] = ""
|
|
|
|
default:
|
|
|
|
result[key] = parts[1]
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
2017-03-09 13:23:45 -05:00
|
|
|
panic(errors.Errorf("expected a map or a list, got %T: %#v", mappingOrList, mappingOrList))
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformShellCommand(value interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
if str, ok := value.(string); ok {
|
|
|
|
return shellwords.Parse(str)
|
|
|
|
}
|
|
|
|
return value, nil
|
|
|
|
}
|
|
|
|
|
2017-01-18 15:27:02 -05:00
|
|
|
func transformHealthCheckTest(data interface{}) (interface{}, error) {
|
|
|
|
switch value := data.(type) {
|
|
|
|
case string:
|
|
|
|
return append([]string{"CMD-SHELL"}, value), nil
|
|
|
|
case []interface{}:
|
|
|
|
return value, nil
|
|
|
|
default:
|
2017-03-09 13:23:45 -05:00
|
|
|
return value, errors.Errorf("invalid type %T for healthcheck.test", value)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-01 15:22:09 -04:00
|
|
|
func transformSize(value interface{}) (interface{}, error) {
|
2016-12-20 16:26:49 -05:00
|
|
|
switch value := value.(type) {
|
|
|
|
case int:
|
|
|
|
return int64(value), nil
|
|
|
|
case string:
|
|
|
|
return units.RAMInBytes(value)
|
|
|
|
}
|
2017-03-09 13:23:45 -05:00
|
|
|
panic(errors.Errorf("invalid type for size %T", value))
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-01-31 15:45:45 -05:00
|
|
|
func toServicePortConfigs(value string) ([]interface{}, error) {
|
|
|
|
var portConfigs []interface{}
|
|
|
|
|
|
|
|
ports, portBindings, err := nat.ParsePortSpecs([]string{value})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
// We need to sort the key of the ports to make sure it is consistent
|
|
|
|
keys := []string{}
|
|
|
|
for port := range ports {
|
|
|
|
keys = append(keys, string(port))
|
|
|
|
}
|
|
|
|
sort.Strings(keys)
|
|
|
|
|
|
|
|
for _, key := range keys {
|
|
|
|
// Reuse ConvertPortToPortConfig so that it is consistent
|
|
|
|
portConfig, err := opts.ConvertPortToPortConfig(nat.Port(key), portBindings)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
for _, p := range portConfig {
|
|
|
|
portConfigs = append(portConfigs, types.ServicePortConfig{
|
|
|
|
Protocol: string(p.Protocol),
|
|
|
|
Target: p.TargetPort,
|
|
|
|
Published: p.PublishedPort,
|
|
|
|
Mode: string(p.PublishMode),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return portConfigs, nil
|
|
|
|
}
|
|
|
|
|
2017-03-14 12:39:26 -04:00
|
|
|
func toMapStringString(value map[string]interface{}, allowNil bool) map[string]interface{} {
|
|
|
|
output := make(map[string]interface{})
|
2016-12-20 16:26:49 -05:00
|
|
|
for key, value := range value {
|
2017-03-14 12:39:26 -04:00
|
|
|
output[key] = toString(value, allowNil)
|
2016-12-20 16:26:49 -05:00
|
|
|
}
|
|
|
|
return output
|
|
|
|
}
|
|
|
|
|
2017-03-14 12:39:26 -04:00
|
|
|
func toString(value interface{}, allowNil bool) interface{} {
|
|
|
|
switch {
|
|
|
|
case value != nil:
|
|
|
|
return fmt.Sprint(value)
|
|
|
|
case allowNil:
|
|
|
|
return nil
|
|
|
|
default:
|
2016-12-20 16:26:49 -05:00
|
|
|
return ""
|
|
|
|
}
|
|
|
|
}
|
Preserve sort-order of extra hosts, and allow duplicate entries
Extra hosts (`extra_hosts` in compose-file, or `--hosts` in services) adds
custom host/ip mappings to the container's `/etc/hosts`.
The current implementation used a `map[string]string{}` as intermediate
storage, and sorted the results alphabetically when converting to a service-spec.
As a result, duplicate hosts were removed, and order of host/ip mappings was not
preserved (in case the compose-file used a list instead of a map).
According to the **host.conf(5)** man page (http://man7.org/linux/man-pages/man5/host.conf.5.html)
multi Valid values are on and off. If set to on, the resolver
library will return all valid addresses for a host that
appears in the /etc/hosts file, instead of only the first.
This is off by default, as it may cause a substantial
performance loss at sites with large hosts files.
Multiple entries for a host are allowed, and even required for some situations,
for example, to add mappings for IPv4 and IPv6 addreses for a host, as illustrated
by the example hosts file in the **hosts(5)** man page (http://man7.org/linux/man-pages/man5/hosts.5.html):
# The following lines are desirable for IPv4 capable hosts
127.0.0.1 localhost
# 127.0.1.1 is often used for the FQDN of the machine
127.0.1.1 thishost.mydomain.org thishost
192.168.1.10 foo.mydomain.org foo
192.168.1.13 bar.mydomain.org bar
146.82.138.7 master.debian.org master
209.237.226.90 www.opensource.org
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
This patch changes the intermediate storage format to use a `[]string`, and only
sorts entries if the input format in the compose file is a mapping. If the input
format is a list, the original sort-order is preserved.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-29 20:33:23 -04:00
|
|
|
|
|
|
|
func toStringList(value map[string]interface{}, separator string, allowNil bool) []string {
|
|
|
|
output := []string{}
|
|
|
|
for key, value := range value {
|
|
|
|
if value == nil && !allowNil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
output = append(output, fmt.Sprintf("%s%s%s", key, separator, value))
|
|
|
|
}
|
|
|
|
sort.Strings(output)
|
|
|
|
return output
|
|
|
|
}
|