From b0903c9db0e1fe0226102e3887b5c30474837e97 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 18 Nov 2016 15:08:29 +0100 Subject: [PATCH] Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922 Signed-off-by: Vincent Demeester --- vendor.conf | 2 +- .../aanand/compose-file/loader/loader.go | 11 +++++++++- .../aanand/compose-file/schema/bindata.go | 20 +++++++++---------- .../aanand/compose-file/schema/schema.go | 2 +- .../aanand/compose-file/types/types.go | 4 ++-- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/vendor.conf b/vendor.conf index 5ea45b32e5..5fe9496b6c 100644 --- a/vendor.conf +++ b/vendor.conf @@ -132,7 +132,7 @@ github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72 # composefile -github.com/aanand/compose-file 8cff34df885ef07824138236bc4d27d359888b17 +github.com/aanand/compose-file a70cb6ea5c403c383b5117dcd1dea78880a47824 github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715 github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45 diff --git a/vendor/github.com/aanand/compose-file/loader/loader.go b/vendor/github.com/aanand/compose-file/loader/loader.go index 0de499147a..7f68b0fb3a 100644 --- a/vendor/github.com/aanand/compose-file/loader/loader.go +++ b/vendor/github.com/aanand/compose-file/loader/loader.go @@ -134,7 +134,7 @@ func GetUnsupportedProperties(configDetails types.ConfigDetails) []string { func sortedKeys(set map[string]bool) []string { var keys []string - for key, _ := range set { + for key := range set { keys = append(keys, key) } sort.Strings(keys) @@ -467,6 +467,8 @@ func convertField( switch fieldTag { case "": return data, nil + case "healthcheck": + return loadHealthcheck(data) case "list_or_dict_equals": return loadMappingOrList(data, "="), nil case "list_or_dict_colon": @@ -571,6 +573,13 @@ func loadShellCommand(value interface{}) (interface{}, error) { return value, nil } +func loadHealthcheck(value interface{}) (interface{}, error) { + if str, ok := value.(string); ok { + return append([]string{"CMD-SHELL"}, str), nil + } + return value, nil +} + func loadSize(value interface{}) (int64, error) { switch value := value.(type) { case int: diff --git a/vendor/github.com/aanand/compose-file/schema/bindata.go b/vendor/github.com/aanand/compose-file/schema/bindata.go index 1b4ee46522..167f2245e9 100644 --- a/vendor/github.com/aanand/compose-file/schema/bindata.go +++ b/vendor/github.com/aanand/compose-file/schema/bindata.go @@ -1,6 +1,6 @@ // Code generated by go-bindata. // sources: -// data/config_schema_v3.json +// data/config_schema_v3.0.json // DO NOT EDIT! package schema @@ -68,22 +68,22 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _dataConfig_schema_v3Json = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x5a\x4b\x93\xdb\xa8\x13\xbf\xfb\x53\x4c\x29\xb9\xc5\x33\x93\xaa\x7f\xea\x5f\xb5\xb9\xed\x71\x4f\xbb\xe7\x75\x29\x2a\x2c\x61\x9b\x8c\x10\x04\x90\x13\x27\xe5\xef\xbe\xa0\x97\x01\xf1\xb2\xad\xec\xe4\xb0\x73\x98\x9a\x81\xee\xa6\x1f\x3f\x9a\xa6\xd1\x8f\xd5\xc3\x43\xf6\x96\x97\x07\x88\x41\xf6\xf1\x21\x3b\x08\x41\x3f\x3e\x3f\x7f\xe6\xa4\x79\xec\x47\x9f\x08\xdb\x3f\x57\x0c\xec\xc4\xe3\xfb\x0f\xcf\xfd\xd8\x9b\x6c\xad\xf8\x50\xa5\x58\x4a\xd2\xec\xd0\xbe\xe8\x67\x8a\xe3\xff\x9e\x14\x73\x4f\x20\x4e\x14\x2a\x12\xb2\xfd\x0c\x4b\xd1\x8f\x31\xf8\xa5\x45\x0c\x2a\xd6\x4d\x76\x84\x8c\x23\x49\x9d\xaf\x57\x6a\x8e\x32\x42\x21\x13\x08\x72\x39\xab\x54\x93\x63\x23\xc9\x38\xa0\x89\xe5\x82\xa1\x66\x9f\x75\xc3\xe7\x4e\x82\x9c\xe4\x90\x1d\x51\xa9\x49\x98\x14\x7d\xf3\x7c\x91\xff\x3c\x91\xad\x6d\xa9\x9a\xb2\xdd\x38\x05\x42\x40\xd6\xfc\x35\xd7\xad\x9b\xfe\xb4\x01\x8f\xdf\x7f\x7f\xfc\xfb\xfd\xe3\x6f\x4f\xc5\x63\xfe\xee\xad\x31\xad\xbc\xcb\xe0\xae\x5f\xbe\x82\x3b\xd4\x20\x21\xad\x99\xd6\xcf\x26\xca\xf3\xf0\xd7\x79\x5a\x18\x54\x55\x47\x0c\x6a\x63\xed\x1d\xa8\x39\x34\x6d\x6e\xa0\xf8\x4a\xd8\x4b\xcc\xe6\x89\xec\x95\x6c\x1e\xd6\x77\xd8\x6c\x9a\x73\x24\x75\x8b\xa3\x11\x1c\xa9\x5e\xc9\x98\x7e\xf9\xfb\xe2\xb7\x1a\x8d\x0e\xd2\xf6\x14\xda\xda\x9d\x82\x06\xda\x5d\xae\x72\xa1\xcd\xef\xab\xc9\x59\x1e\x2f\x55\x90\xd6\xe4\xa4\xc6\x3c\xfe\xe8\x09\x30\x6c\x44\x36\xb9\x40\xf2\x6d\x5b\x54\x57\xb6\x47\x49\x03\xff\x54\x22\x36\xda\xe0\x83\x94\x6c\x6d\x6c\x4d\x4e\x37\x6f\xfc\xe7\x0f\xf8\x34\xef\xb1\x65\x9a\x97\x99\x4b\xc0\x6f\xa2\x33\x2a\xbc\x74\xef\x02\x52\xbe\x40\xb6\x43\x35\x4c\xe5\x00\x6c\xcf\x03\x2e\xab\x11\x17\x05\x61\x45\x85\xa4\xf6\x67\x8b\x7d\x26\x2f\x8e\xa7\x89\x55\xfb\x2f\x5f\x39\x04\x66\x25\xa0\x85\x14\x67\xd8\x01\x18\x03\xa7\x6c\x2d\x01\x24\x20\xe6\x6e\x13\x1f\xb2\xb6\x41\x5f\x5a\xf8\xc7\x40\x22\x58\x0b\x6d\xb9\x95\x54\x6e\x79\xc1\x7b\x46\x5a\x5a\x50\xc0\x14\xc0\xc2\xee\x97\x71\xc5\x18\x34\x4b\xa1\xee\x1a\x3b\x12\x3c\x2f\x31\x07\x50\x03\x59\xd1\x00\x1c\x03\x92\xda\x75\xb0\xa9\x78\xd1\x9f\x7f\x41\x18\xed\x8a\x9e\x9f\x5b\x02\xa6\xc3\x70\xd1\x78\x54\x4d\x08\xd8\xbd\x18\x05\x6d\xa5\x5b\x66\x31\x16\x1c\x02\x56\x1e\x6e\xe4\x27\x58\xba\x2f\xc5\x77\x12\x28\xec\x44\x09\xea\xf1\xf2\xcb\x01\x01\x36\xc7\x62\xca\x25\x57\xbb\x41\x72\x23\x46\x1a\x3c\xee\x86\x94\x04\x33\x25\x79\xc5\xff\x8d\x12\x0e\x6d\xc7\x58\x06\xea\x53\x93\xa9\x86\x4f\x46\x8e\xcd\x68\xb8\x74\x4a\xd3\xe2\x2d\x64\xaa\xa4\x33\x28\x77\x84\x61\xa0\x94\x1d\xd7\xd6\xa6\x0d\x4f\x3b\x90\xa7\x3b\x50\xb7\x41\x1d\xeb\xa0\x96\xde\x69\x5e\x96\x87\xb8\x14\xcf\x40\x71\x20\x5c\xa4\xe7\x70\x8d\xfd\x00\x41\x2d\x0e\xb2\x28\x2e\x5f\x02\xec\x3a\x95\xc1\x2d\x97\x4d\x01\x39\xc2\x60\x1f\x27\xa2\x65\x8c\xa4\x06\x5b\x58\xdf\x64\xe7\xa2\xce\xd7\xc4\x92\xfd\x5e\x91\xfa\x10\x37\xab\x5c\x86\xe9\xd8\x99\x5f\x31\x24\x6f\x14\xa9\x07\x38\xa1\x97\x82\xcb\x9e\x8c\x17\x20\xbd\x42\xc1\xea\xd3\x20\xfd\xf4\xd4\x17\x9f\x81\x5d\xd5\xfd\x55\xd7\x59\x6e\x97\x0b\xea\x67\x3e\x66\x8e\x58\x16\xa6\x15\x14\x46\x54\x30\x28\x55\xdd\xc0\x20\xf7\xc4\xf5\x42\x3a\x14\xfb\x05\x26\x95\x0f\xa0\x33\x62\xdb\x37\xde\x4c\x7d\xf5\x41\xd8\xb1\x5d\x5d\x3f\x26\x85\x2e\x7a\x81\x88\x58\xe3\x53\x2f\x55\xcd\x8b\xba\x71\x88\x75\x74\xa0\x46\x80\xc3\xf8\x66\xf7\x3a\xd2\x90\x86\xe8\xf1\x43\x22\x26\x5c\xbc\xff\x0f\xf2\x7a\x58\xbd\x32\xd3\x6b\xe4\x88\xa8\x8b\x2a\xdd\x76\x73\x29\x92\x47\x76\xdb\x4f\x2e\xe1\x29\xaa\xfc\xb9\xa2\xcb\x10\xfa\x06\xa3\x84\x89\xd9\xee\xfa\x77\x8e\xfb\x7e\xe9\xbb\x4f\x7b\x2a\x13\xb7\x2c\x97\xf6\xd0\xbc\xb5\x6c\x09\xa9\x21\x68\x8c\xd4\xc3\x20\xa8\x64\xc9\x5c\x9f\x12\x28\xb9\x00\x2c\x7a\xa1\xe0\xb0\x6c\x19\x12\xa7\x42\x9e\x07\x8b\xd7\x19\xfc\x80\x0b\x8e\xbe\x43\x33\x9a\x97\x7c\x3f\x08\xca\x0d\x1e\x51\xa1\x46\x6a\x03\x9b\xa8\x89\x5c\x10\x2a\xe5\xef\x25\xe6\xa2\x66\x2a\xd2\x3d\x03\x25\x2c\x24\x36\x11\xa9\x5c\x0c\x6b\x3d\xb6\x55\xcb\x80\xc2\xb3\x21\x46\x60\xba\xbb\xf1\x76\x20\x44\x3c\x66\x6d\x8d\x30\xf2\x83\xd9\x91\x25\x13\x12\x79\x9f\xc4\xdd\xb9\x3b\x90\xb7\x2f\x9a\xca\x6b\x86\xc4\x26\x73\xa5\xbb\x40\xe9\x10\xae\x1c\x12\x4a\x86\x03\x60\x66\x94\x02\x7a\x74\x0c\x9c\xec\x84\x9b\xc1\x55\x50\x38\xf5\x32\x3a\xb8\x9d\xbc\xf5\xa0\x48\xee\xa4\xbf\x2a\x27\xdb\x6a\xe4\xde\xb4\x78\x76\xa6\xc5\x96\x47\xab\x3b\xbd\xbf\xb8\xe8\x4e\x56\x25\x8c\x42\x76\x85\xdc\x2a\xac\x2c\x75\xaf\xe8\xf0\x5a\xb7\x89\x51\x80\xab\xd7\xa7\x93\xda\xfd\xbe\xcd\x04\xb8\xf1\x94\xb8\x74\x49\x3d\x8d\x3f\x85\x0f\x76\x34\x92\x87\xcb\xa7\x02\x61\x48\x5a\x11\xa1\x62\x50\x8e\x59\x9e\x1f\x32\xdd\x2f\xdd\xc0\xb9\x29\x72\x1d\xa1\xd6\x16\x8d\xc4\x4d\xa3\x5c\x20\x6c\x81\xb2\x5b\x8b\x06\xad\x51\x09\x78\x2c\x81\xdc\x71\x3b\x6c\x69\x05\x04\x2c\xfa\x37\xa2\xab\x52\x76\x20\x57\x53\xc0\x40\x5d\x43\xb9\x28\x4e\xc9\x7d\x32\x06\x35\x38\xdd\x74\x96\x75\xec\x3b\x80\xea\x96\xc1\x02\x94\x62\x78\x88\x8a\x20\x4e\x3a\x5f\x3a\x86\x38\x93\x40\xda\x92\x18\x7c\x2b\xc6\x65\x3b\x12\xe7\x8e\xf1\xd6\x54\xa9\x17\x3b\x0d\x09\x9c\xb4\xac\x9c\x39\xfb\xe6\x10\x5d\xce\x68\x0f\x62\xc6\x15\x67\xa6\xcb\x09\x95\x6f\xa6\x7b\x77\x94\x3f\x7a\x24\x0c\x45\x5e\x41\x89\x44\xfb\x69\x29\x0b\x25\xa4\x7b\x27\xa7\x00\xe2\x4e\x04\x2a\x38\xa8\x12\x06\x53\x11\xdd\xac\x1d\xc3\x57\xd4\x54\xe4\xeb\x15\x0b\x2e\x07\x25\x5a\xcb\xfa\xd1\xca\x77\xf7\x3a\x5a\xea\x0e\xa4\xa9\x57\x9f\xd8\xf7\x9a\x75\xc7\x81\x3d\xe1\x33\x92\xf5\x27\xba\xf8\x33\xa6\x27\xd3\x97\xb4\x8d\x36\x63\x30\xc4\x84\x39\x01\x18\xb0\x31\xf1\xd5\x39\x66\xe1\x48\xb6\xc0\xa1\x96\xd4\xbc\x1b\xa8\xd4\x5d\x6d\xf1\x4b\x42\xbc\x41\x97\xc7\xf3\x11\xa2\x00\x2f\xb5\x39\x92\xdb\x99\x99\xf3\x08\x36\xd6\x9e\xb7\x01\x7a\x75\x9d\xad\x80\x98\xd6\x71\xdd\x07\x0a\xde\x6e\x25\x42\x42\xd0\xbc\xfc\x38\xdf\x58\xd3\x6f\x17\x67\xff\x5d\xe2\xbe\x9c\x37\xbe\x44\x78\xa2\xba\x99\xee\xb1\xeb\xc9\x57\x79\x72\x88\xbd\xcf\x00\xcb\xe9\x7f\x65\x7d\x77\x47\x5a\x1c\xbe\x9a\x88\xa4\x8c\x81\xea\xbf\x8c\x31\x48\x79\x7d\x7c\x05\xce\xc4\x1b\x2f\x07\x57\x80\xc6\x6a\x18\x69\xe0\x99\xdf\x08\x43\x71\x4e\x6e\x77\x0f\x1c\xb9\xa9\x86\x4d\xf6\x71\xfe\x45\x9a\x99\x42\x43\xbd\x84\x91\xc4\xd3\xfe\xb4\x16\x1d\x9c\x17\xb6\x7c\x41\xd8\x3e\xbd\x0b\x1c\x14\xa1\x67\xa9\x9f\x94\x61\x17\xe8\xd3\xb8\x63\x6a\x15\x97\xa3\x77\xe7\x9f\x55\x79\x32\x95\xc6\x3f\xfb\xc8\x4a\xd9\xd9\x9c\x66\x1d\x8b\x1f\x66\x03\xad\xff\x40\x2a\x37\xfc\x63\x91\xf4\x8f\xbc\x5a\x9e\xc8\xf5\x7a\xdb\x17\x46\xe7\xa7\x57\x76\xfb\x6e\xfc\x04\x2a\x0f\x6f\xf6\xd5\xf8\xfb\xbc\x3a\xaf\xfe\x09\x00\x00\xff\xff\xa9\x28\xf2\x96\x34\x2a\x00\x00") +var _dataConfig_schema_v30Json = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x5a\x4d\x93\xdb\x28\x13\xbe\xfb\x57\x4c\x29\xb9\xc5\x33\x93\xaa\x37\xf5\x56\x6d\x6e\x7b\xdc\xd3\xee\x79\x5d\x8a\x0a\x4b\xd8\x26\x23\x09\x02\xc8\x89\x93\xf2\x7f\x5f\x10\x92\x0c\x88\x2f\xdb\x4a\x66\x0f\x3b\x87\xa9\x19\xe8\x6e\xfa\xe3\xa1\x69\x1a\xfd\x58\x3d\x3c\x64\x6f\x59\x79\x80\x0d\xc8\x3e\x3e\x64\x07\xce\xc9\xc7\xe7\xe7\xcf\x0c\xb7\x8f\x6a\xf4\x09\xd3\xfd\x73\x45\xc1\x8e\x3f\xbe\xff\xf0\xac\xc6\xde\x64\x6b\xc9\x87\x2a\xc9\x52\xe2\x76\x87\xf6\x85\x9a\x29\x8e\xff\x7b\x7a\xff\x24\xd9\x15\x09\x3f\x11\x28\x89\xf0\xf6\x33\x2c\xb9\x1a\xa3\xf0\x4b\x87\x28\x94\xcc\x9b\xec\x08\x29\x43\x82\x3a\x5f\xaf\xe4\x1c\xa1\x98\x40\xca\x11\x64\x62\x56\x2a\x27\xc6\x46\x92\x71\x40\x13\xcb\x38\x45\xed\x3e\xeb\x87\xcf\xbd\x04\x31\xc9\x20\x3d\xa2\x52\x93\x30\xa9\xfa\xe6\xf9\x22\xff\x79\x22\x5b\xdb\x52\x35\x65\xfb\x71\x02\x38\x87\xb4\xfd\x6b\xae\x5b\x3f\xfd\x69\x03\x1e\xbf\xff\xfe\xf8\xf7\xfb\xc7\xdf\x9e\x8a\xc7\xfc\xdd\x5b\x63\x5a\xfa\x97\xc2\x9d\x5a\xbe\x82\x3b\xd4\x22\x2e\xac\x99\xd6\xcf\x26\xca\xf3\xf0\xd7\x79\x5a\x18\x54\x55\x4f\x0c\x6a\x63\xed\x1d\xa8\x19\x34\x6d\x6e\x21\xff\x8a\xe9\x4b\xcc\xe6\x89\xec\x95\x6c\x1e\xd6\x77\xd8\x6c\x9a\x73\xc4\x75\xd7\x44\x23\x38\x52\xbd\x92\x31\x6a\xf9\xfb\xe2\xb7\x1a\x8d\x0e\xd2\x2a\x0a\x6d\xed\x5e\x41\x03\xed\x2e\x57\xb9\xd0\xe6\xf7\xd5\xe4\x2c\x8f\x97\x2a\x48\x6a\x7c\x92\x63\x1e\x7f\x28\x82\x06\xb6\x3c\x9b\x5c\x20\xf8\xb6\x1d\xaa\x2b\xdb\xa3\xb8\x85\x7f\x4a\x11\x1b\x6d\xf0\x41\x48\xb6\x36\xb6\x26\xa7\x9f\x37\xfe\xf3\x07\x7c\x9a\xf7\xd8\x32\xcd\x8b\xdc\xc5\xe1\x37\xde\x1b\x15\x5e\x5a\xb9\x00\x97\x2f\x90\xee\x50\x0d\x53\x39\x00\xdd\xb3\x80\xcb\x6a\xc4\x78\x81\x69\x51\x21\xa1\xfd\xd9\x62\x9f\xc9\x8b\xe3\x69\x62\xd5\xfe\xcb\x57\x0e\x81\x59\x09\x48\x21\xc4\x19\x76\x00\x4a\xc1\x29\x5b\x0b\x00\x71\xd8\x30\xb7\x89\x0f\x59\xd7\xa2\x2f\x1d\xfc\x63\x20\xe1\xb4\x83\xb6\xdc\x4a\x28\xb7\xbc\xe0\x3d\xc5\x1d\x29\x08\xa0\x12\x60\x61\xf7\x8b\xb8\x36\x0d\x68\x97\x42\xdd\x35\x76\x24\x78\x5e\x60\x0e\xa0\x16\xd2\xa2\x05\x4d\x0c\x48\x72\xd7\xc1\xb6\x62\x85\x3a\xff\x82\x30\xda\x15\x8a\x9f\x59\x02\xa6\xc3\x70\xd1\x78\x54\x6d\x08\xd8\x4a\x8c\x84\xb6\xd4\x2d\xb3\x18\x0b\x06\x01\x2d\x0f\x37\xf2\xe3\x46\xb8\x2f\xc5\x77\x02\x28\xf4\x44\x30\x52\x78\xf9\xd7\x01\x01\xb6\xc7\x62\xca\x25\x57\xbb\x41\x70\x23\x8a\xdb\x66\xdc\x0d\x29\x09\x66\x4a\xf2\x92\xff\x1b\xc1\x0c\xda\x8e\xb1\x0c\xd4\xa7\x26\x53\x0d\x9f\x8c\x1c\x9b\xd1\x70\xe1\x94\xb6\x6b\xb6\x90\xca\x92\xce\xa0\xdc\x61\xda\x00\xa9\xec\xb8\xb6\x36\x6d\x78\xda\x81\x3c\xdd\x81\xba\x0d\xf2\x58\x07\xb5\xf0\x4e\xfb\xb2\x3c\xc4\x85\x78\x0a\x8a\x03\x66\x3c\x3d\x87\x6b\xec\x07\x08\x6a\x7e\x10\x65\x71\xf9\x12\x60\xd7\xa9\x0c\x6e\xb1\x6c\x0a\xc8\x51\x03\xf6\x71\x22\x52\xc6\x48\x6a\xb0\x85\xf5\x4d\x76\x2e\xea\x7c\x4d\x2c\xde\xef\x25\xa9\x0f\x71\xb3\xca\x65\x98\x8e\x9d\xf9\x15\x45\xe2\x46\x91\x7a\x80\x63\x72\x29\xb8\xec\xc9\x78\x01\xa2\x14\x0a\x56\x9f\x06\xe9\xa7\x27\x55\x7c\x06\x76\x55\xff\x57\x5d\x67\xb9\x5d\x2e\xc8\x9f\xf9\x98\x39\x62\x59\x98\x56\x50\x18\x51\x69\x40\x29\xeb\x06\x0a\x99\x27\xae\x17\xd2\xa1\xd8\x2f\x1a\x5c\xf9\x00\x3a\x23\xb6\x7d\xe3\xcd\xd4\x57\x1f\x84\x3d\xdb\xd5\xf5\x63\x52\xe8\xa2\x17\x88\x88\x35\x3e\xf5\x52\xd5\xbc\xa8\x1b\x87\x58\x4f\x07\x6a\x04\x18\x8c\x6f\x76\xaf\x23\x0d\x69\x88\x1c\x3f\x24\x62\xc2\xc5\xfb\xff\x20\xaf\x87\xd5\x2b\x33\xbd\x46\x8e\x88\xba\xa8\xd2\x6f\x37\x97\x22\x79\x64\xb7\xfd\xe4\x12\x9e\xa0\xca\x9f\x2b\xfa\x0c\xa1\x6f\x30\x82\x29\x9f\xed\xae\x5f\x73\xdc\xab\xa5\xef\x3e\xed\x89\x48\xdc\xa2\x5c\xda\x43\xf3\xd6\xb2\xc5\xb8\x86\xa0\x35\x52\x0f\x85\xa0\x12\x25\x73\x7d\x4a\xa0\x64\x1c\xd0\xe8\x85\x82\xc1\xb2\xa3\x88\x9f\x0a\x71\x1e\x2c\x5e\x67\xb0\x43\x53\x30\xf4\x1d\x9a\xd1\xbc\xe4\xfb\x41\x50\x6e\xf0\xf0\x0a\xb5\x42\x1b\xd8\x46\x4d\x64\x1c\x13\x21\x7f\x2f\x30\x17\x35\x53\x92\xee\x29\x28\x61\x21\xb0\x89\x70\xe5\x62\x58\xeb\xb1\xad\x3a\x0a\x24\x9e\x0d\x31\xbc\x21\xbb\x1b\x6f\x07\x9c\xc7\x63\xd6\xd5\xa8\x41\x7e\x30\x3b\xb2\x64\x42\x22\x57\x49\xdc\x9d\xbb\x03\x79\xfb\xa2\xa9\xb8\x66\x08\x6c\x52\x57\xba\x0b\x94\x0e\xe1\xca\x21\xa1\x64\x38\x00\x6a\x46\x29\xa0\x47\xcf\xc0\xf0\x8e\xbb\x19\x5c\x05\x85\x53\x2f\xa3\x83\xdb\xcb\x5b\x0f\x8a\xe4\x4e\xfa\xab\x72\xb2\xad\x46\xee\x4d\x8b\x67\x67\x5a\xec\x58\xb4\xba\xd3\xfb\x8b\x8b\xee\x64\x59\xc2\x48\x64\x57\xc8\xad\xc2\xca\x52\xf7\x8a\x0e\xaf\x75\x9b\x18\x05\xb8\x7a\x7d\x3a\xa9\xdd\xef\xdb\x4c\x80\x1b\x4f\x89\x4b\x97\xd4\xd3\xf8\x93\xf8\xa0\x47\x23\x79\xb8\x7c\xca\x51\x03\x71\xc7\x23\x54\x14\x8a\x31\xcb\xf3\x43\xa6\x33\x84\x89\xb4\x9c\x5a\x0a\xfe\xd2\x4b\x7b\x85\x18\xd8\x5a\xfd\xbf\x29\x47\xdd\x14\x5e\x25\xf6\xd2\x3b\x8d\x04\x57\xa3\x5c\x20\xb6\x81\xda\x5c\x0b\x19\xa9\x51\x09\x58\x2c\xcb\xdc\x71\x85\xec\x48\x05\x38\x2c\xd4\x53\xd2\x55\x79\x3d\x90\xd0\x09\xa0\xa0\xae\xa1\x58\xb4\x49\x49\x90\x22\x06\x35\x38\xdd\x74\xe0\xf5\xec\x3b\x80\xea\x8e\xc2\x02\x94\x7c\x78\xad\x8a\x20\x53\x38\x5f\x38\x06\x3b\x33\x45\xda\x92\x0d\xf8\x56\x8c\xcb\xf6\x24\xce\x6d\xe5\x2d\xbc\x52\x6f\x7f\x1a\x12\x18\xee\x68\x39\x73\xf6\xcd\x21\xba\x1c\xe4\x1e\xc4\x8c\x2b\xce\x4c\x17\x13\x32\x29\x4d\x97\xf3\x28\x7f\xf4\xdc\x18\x2a\xc1\x82\x60\x81\xf6\xd3\x52\x16\x0a\x48\x2b\x27\xa7\x00\xe2\x4e\x04\x4a\x38\xc8\x3a\xa7\x21\x3c\xba\x59\x7b\x86\xaf\xa8\xad\xf0\xd7\x2b\x16\x5c\x0e\x4a\xa4\x16\x45\xa6\x95\xef\xee\x75\xb4\xd0\x1d\x08\x53\xaf\x3e\xd6\xef\x35\xeb\x8e\x53\x7d\xc2\x67\x24\xeb\x4f\x74\xf1\xb7\x4e\x4f\xa6\x2f\x49\x17\xed\xd8\x34\xb0\xc1\xd4\x09\xc0\x80\x8d\x89\x4f\xd3\x31\x0b\x47\xb2\x05\x0e\xb5\xa4\x0e\xdf\x40\x25\x2f\x74\x8b\xdf\x24\xe2\x5d\xbc\x3c\x9e\x8f\x10\x01\xcd\x52\x9b\x23\xb9\xe7\x99\x39\x8f\x60\x63\xed\x79\xaf\x40\xa9\xeb\xec\x17\xc4\xb4\x8e\xeb\x3e\x50\xb0\x6e\x2b\x10\x12\x82\xe6\xe5\xc7\xf9\x10\x9b\x7e\x05\x39\xfb\x2f\x1c\xf7\xe5\xbc\xf1\xb9\xc2\x13\xd5\xcd\x54\x48\xae\x27\x5f\xe5\xc9\x21\xf6\xbe\x15\x2c\xa7\xff\x95\xf5\xdd\x1d\x69\x71\xf8\xb4\x22\x92\x32\x06\xaa\xff\x32\xc6\x20\xe5\xf5\xf1\x15\x38\x13\x6f\xbc\x1c\x5c\x01\x1a\xab\xab\xa4\x81\x67\x7e\x73\x0c\xc5\x39\xb9\x27\x3e\x70\xe4\xa6\x1a\x36\xd9\xc7\xf9\x67\x6b\x66\x0a\x0d\x35\x1c\x46\x12\x4f\x8f\xd4\x5a\x74\x70\x5e\xd8\xf2\x05\x61\xfb\xf4\x2e\x70\x50\x84\xde\xae\x7e\x52\x86\x5d\xa0\x99\xe3\x8e\xa9\x55\x5c\x8e\xde\x9d\x7f\x7b\xe5\xc9\x54\x1a\xff\xec\x4b\x2c\x69\x67\x7b\x9a\x75\x36\x7e\x98\x5d\x36\xf5\x15\x55\x6e\xf8\xc7\x22\x51\x2f\xc1\x5a\x9e\xc8\xf5\x7a\xdb\x17\x46\xe7\xf7\x59\x76\x8f\x6f\xfc\x4e\x2a\x0f\x6f\xf6\xd5\xf8\xfb\xbc\x3a\xaf\xfe\x09\x00\x00\xff\xff\x37\x89\x5b\xf1\x5b\x2a\x00\x00") -func dataConfig_schema_v3JsonBytes() ([]byte, error) { +func dataConfig_schema_v30JsonBytes() ([]byte, error) { return bindataRead( - _dataConfig_schema_v3Json, - "data/config_schema_v3.json", + _dataConfig_schema_v30Json, + "data/config_schema_v3.0.json", ) } -func dataConfig_schema_v3Json() (*asset, error) { - bytes, err := dataConfig_schema_v3JsonBytes() +func dataConfig_schema_v30Json() (*asset, error) { + bytes, err := dataConfig_schema_v30JsonBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "data/config_schema_v3.json", size: 10804, mode: os.FileMode(420), modTime: time.Unix(1478512187, 0)} + info := bindataFileInfo{name: "data/config_schema_v3.0.json", size: 10843, mode: os.FileMode(420), modTime: time.Unix(1479392593, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -140,7 +140,7 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "data/config_schema_v3.json": dataConfig_schema_v3Json, + "data/config_schema_v3.0.json": dataConfig_schema_v30Json, } // AssetDir returns the file names below a certain @@ -184,7 +184,7 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ "data": &bintree{nil, map[string]*bintree{ - "config_schema_v3.json": &bintree{dataConfig_schema_v3Json, map[string]*bintree{}}, + "config_schema_v3.0.json": &bintree{dataConfig_schema_v30Json, map[string]*bintree{}}, }}, }} diff --git a/vendor/github.com/aanand/compose-file/schema/schema.go b/vendor/github.com/aanand/compose-file/schema/schema.go index 938c709c3c..d926ef02e9 100644 --- a/vendor/github.com/aanand/compose-file/schema/schema.go +++ b/vendor/github.com/aanand/compose-file/schema/schema.go @@ -32,7 +32,7 @@ func init() { // Validate uses the jsonschema to validate the configuration func Validate(config map[string]interface{}) error { - schemaData, err := Asset("data/config_schema_v3.json") + schemaData, err := Asset("data/config_schema_v3.0.json") if err != nil { return err } diff --git a/vendor/github.com/aanand/compose-file/types/types.go b/vendor/github.com/aanand/compose-file/types/types.go index 55ee177978..50e1ca247a 100644 --- a/vendor/github.com/aanand/compose-file/types/types.go +++ b/vendor/github.com/aanand/compose-file/types/types.go @@ -124,14 +124,14 @@ type DeployConfig struct { } type HealthCheckConfig struct { - Command []string `compose:"shell_command"` + Test []string `compose:"healthcheck"` Timeout string Interval string Retries *uint64 } type UpdateConfig struct { - Parallelism uint64 + Parallelism *uint64 Delay time.Duration FailureAction string `mapstructure:"failure_action"` Monitor time.Duration