Merge pull request #1970 from mnowster/fix-expose-allowed-values

fix expose schema definition

compose/config/fields_schema.json

@@ -42,7 +42,11 @@
           ]
         },
 
-        "expose": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "expose": {
+          "type": "array",
+          "items": {"type": ["string", "number"]},
+          "uniqueItems": true
+        },
 
         "extends": {
           "type": "object",

tests/unit/config_test.py

@@ -239,6 +239,21 @@ class ConfigTest(unittest.TestCase):
                 )
             )
 
+    def test_valid_config_which_allows_two_type_definitions(self):
+        expose_values = [["8000"], [8000]]
+        for expose in expose_values:
+            service = config.load(
+                config.ConfigDetails(
+                    {'web': {
+                        'image': 'busybox',
+                        'expose': expose
+                    }},
+                    'working_dir',
+                    'filename.yml'
+                )
+            )
+            self.assertEqual(service[0]['expose'], expose)
+
 
 class InterpolationTest(unittest.TestCase):
     @mock.patch.dict(os.environ)