Add 2.4 file format with platform support. Also reads DOCKER_DEFAULT_…

…PLATFORM env Signed-off-by: Joffrey F <[email protected]>
docker · Mar 9, 2018 · 92d3a34 · 92d3a34
1 parent 62ecf2c
commit 92d3a34
Show file tree

Hide file tree

Showing 9 changed files with 611 additions and 8 deletions.
diff --git a/compose/cli/command.py b/compose/cli/command.py
@@ -122,7 +122,9 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
     )
 
     with errors.handle_connection_errors(client):
-        return Project.from_config(project_name, config_data, client)
+        return Project.from_config(
+            project_name, config_data, client, environment.get('DOCKER_DEFAULT_PLATFORM')
+        )
 
 
 def get_project_name(working_dir, project_name=None, environment=None):

diff --git a/compose/config/config.py b/compose/config/config.py
@@ -125,11 +125,12 @@
     'container_name',
     'credential_spec',
     'dockerfile',
+    'init',
     'log_driver',
     'log_opt',
     'logging',
     'network_mode',
-    'init',
+    'platform',
     'scale',
     'stop_grace_period',
 ]