From ddd1590c3f20028f5ccf25df85f4d4b64054b5d2 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 24 May 2018 14:40:15 +0200 Subject: [PATCH] Add composefile schema 3.7 with platfrom It's ignored for now (docker stack deploy) and will print a warning if present. Signed-off-by: Vincent Demeester --- cli/compose/loader/full-example.yml | 1 + cli/compose/schema/bindata.go | 72 +++++++++---------- .../schema/data/config_schema_v3.7.json | 2 +- cli/compose/types/types.go | 1 + 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml index e9f4183aee28..00032a0508ca 100644 --- a/cli/compose/loader/full-example.yml +++ b/cli/compose/loader/full-example.yml @@ -197,6 +197,7 @@ services: other-other-network: pid: "host" + platform: "linux/x86_64" ports: - 3000 diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go index 9649d03070b8..11cc23ac7989 100644 --- a/cli/compose/schema/bindata.go +++ b/cli/compose/schema/bindata.go @@ -467,44 +467,44 @@ DoTuq9lAU9Q4O1xV/59X/w8AAP//zRo7vm9CAAA= "/data/config_schema_v3.7.json": { local: "data/config_schema_v3.7.json", - size: 17540, + size: 17579, modtime: 1518458244, compressed: ` -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 `, }, diff --git a/cli/compose/schema/data/config_schema_v3.7.json b/cli/compose/schema/data/config_schema_v3.7.json index 4c3d24dcd279..bd4c0564a722 100644 --- a/cli/compose/schema/data/config_schema_v3.7.json +++ b/cli/compose/schema/data/config_schema_v3.7.json @@ -203,7 +203,7 @@ ] }, "pid": {"type": ["string", "null"]}, - + "platform": {"type": "string"}, "ports": { "type": "array", "items": { diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go index 397bc79c1f04..792d1b683282 100644 --- a/cli/compose/types/types.go +++ b/cli/compose/types/types.go @@ -19,6 +19,7 @@ var UnsupportedProperties = []string{ "mac_address", "network_mode", "pid", + "platform", "privileged", "restart", "security_opt",