From 5c2165eaafbb625eb2058b199b571a228e86df03 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 19 Jan 2017 15:41:31 -0800
Subject: [PATCH] Fix volume definition in v3 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config_schema_v3.0.json    | 4 ++--
 tests/acceptance/cli_test.py              | 8 +++++++-
 tests/fixtures/v3-full/docker-compose.yml | 4 ++++
 tests/integration/testcases.py            | 7 +++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/compose/config/config_schema_v3.0.json b/compose/config/config_schema_v3.0.json
index ae4c05300..584b6ef5d 100644
--- a/compose/config/config_schema_v3.0.json
+++ b/compose/config/config_schema_v3.0.json
@@ -330,9 +330,9 @@
             "name": {"type": "string"}
           },
           "additionalProperties": false
-        }
+        },
+        "labels": {"$ref": "#/definitions/list_or_dict"}
       },
-      "labels": {"$ref": "#/definitions/list_or_dict"},
       "additionalProperties": false
     },
 
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index b9766226d..ce31dd18f 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -295,7 +295,13 @@ class CLITestCase(DockerClientTestCase):
         assert yaml.load(result.stdout) == {
             'version': '3.0',
             'networks': {},
-            'volumes': {},
+            'volumes': {
+                'foobar': {
+                    'labels': {
+                        'com.docker.compose.test': 'true',
+                    },
+                },
+            },
             'services': {
                 'web': {
                     'image': 'busybox',
diff --git a/tests/fixtures/v3-full/docker-compose.yml b/tests/fixtures/v3-full/docker-compose.yml
index b4d1b6422..a1661ab93 100644
--- a/tests/fixtures/v3-full/docker-compose.yml
+++ b/tests/fixtures/v3-full/docker-compose.yml
@@ -35,3 +35,7 @@ services:
       retries: 5
 
     stop_grace_period: 20s
+volumes:
+  foobar:
+    labels:
+      com.docker.compose.test: 'true'
diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py
index f6bc402bf..230bd2d92 100644
--- a/tests/integration/testcases.py
+++ b/tests/integration/testcases.py
@@ -13,6 +13,7 @@ from compose.config.config import resolve_environment
 from compose.config.config import V1
 from compose.config.config import V2_0
 from compose.config.config import V2_1
+from compose.config.config import V3_0
 from compose.config.environment import Environment
 from compose.const import API_VERSIONS
 from compose.const import LABEL_PROJECT
@@ -36,13 +37,15 @@ def get_links(container):
 
 def engine_max_version():
     if 'DOCKER_VERSION' not in os.environ:
-        return V2_1
+        return V3_0
     version = os.environ['DOCKER_VERSION'].partition('-')[0]
     if version_lt(version, '1.10'):
         return V1
     elif version_lt(version, '1.12'):
         return V2_0
-    return V2_1
+    elif version_lt(version, '1.13'):
+        return V2_1
+    return V3_0
 
 
 def build_version_required_decorator(ignored_versions):