зеркало из https://github.com/microsoft/docker.git
Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Родитель
90d10203a4
Коммит
f3dcae7dd3
|
@ -132,7 +132,7 @@ github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
|
|||
github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72
|
||||
|
||||
# composefile
|
||||
github.com/aanand/compose-file 480a79677acccb83b52c41161c22eaf4358460cc
|
||||
github.com/aanand/compose-file 8cff34df885ef07824138236bc4d27d359888b17
|
||||
github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715
|
||||
github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
|
||||
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
|
||||
|
|
|
@ -68,8 +68,8 @@ func Load(configDetails types.ConfigDetails) (*types.Config, error) {
|
|||
|
||||
cfg := types.Config{}
|
||||
version := configDict["version"].(string)
|
||||
if version != "3" {
|
||||
return nil, fmt.Errorf("Unsupported version: %#v. The only supported version is 3", version)
|
||||
if version != "3" && version != "3.0" {
|
||||
return nil, fmt.Errorf(`Unsupported Compose file version: %#v. The only version supported is "3" (or "3.0")`, version)
|
||||
}
|
||||
|
||||
if services, ok := configDict["services"]; ok {
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -14,7 +14,6 @@ var UnsupportedProperties = []string{
|
|||
"dns_search",
|
||||
"domainname",
|
||||
"external_links",
|
||||
"extra_hosts",
|
||||
"ipc",
|
||||
"links",
|
||||
"mac_address",
|
||||
|
@ -24,7 +23,6 @@ var UnsupportedProperties = []string{
|
|||
"restart",
|
||||
"security_opt",
|
||||
"shm_size",
|
||||
"stdin_open",
|
||||
"stop_signal",
|
||||
"tmpfs",
|
||||
}
|
||||
|
@ -84,6 +82,7 @@ type ServiceConfig struct {
|
|||
ExternalLinks []string `mapstructure:"external_links"`
|
||||
ExtraHosts map[string]string `mapstructure:"extra_hosts" compose:"list_or_dict_colon"`
|
||||
Hostname string
|
||||
HealthCheck *HealthCheckConfig
|
||||
Image string
|
||||
Ipc string
|
||||
Labels map[string]string `compose:"list_or_dict_equals"`
|
||||
|
@ -124,6 +123,13 @@ type DeployConfig struct {
|
|||
Placement Placement
|
||||
}
|
||||
|
||||
type HealthCheckConfig struct {
|
||||
Command []string `compose:"shell_command"`
|
||||
Timeout string
|
||||
Interval string
|
||||
Retries *uint64
|
||||
}
|
||||
|
||||
type UpdateConfig struct {
|
||||
Parallelism uint64
|
||||
Delay time.Duration
|
||||
|
|
Загрузка…
Ссылка в новой задаче