Add composefile v1 / v2 parsing and validation support

cli/compose/loader/loader.go

@@ -65,6 +65,12 @@ func Load(configDetails types.ConfigDetails) (*types.Config, error) {
 		return nil, err
 	}
 
+	if _, ok := configDict["version"]; !ok {
+		configDict = map[string]interface{}{
+			"services": configDict,
+		}
+	}
+
 	cfg := types.Config{}
 
 	config, err := interpolateConfig(configDict, configDetails.LookupEnv)

cli/compose/loader/loader_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli/compose/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"path/filepath"
 )
 
 func buildConfigDetails(source map[string]interface{}, env map[string]string) types.ConfigDetails {
@@ -20,7 +21,7 @@ func buildConfigDetails(source map[string]interface{}, env map[string]string) ty
 	}
 
 	return types.ConfigDetails{
-		WorkingDir: workingDir,
+		WorkingDir: filepath.Join(workingDir, "testdata"),
 		ConfigFiles: []types.ConfigFile{
 			{Filename: "filename.yml", Config: source},
 		},
@@ -299,26 +300,6 @@ services:
 	require.NoError(t, err)
 }
 
-func TestUnsupportedVersion(t *testing.T) {
-	_, err := loadYAML(`
-version: "2"
-services:
-  foo:
-    image: busybox
-`)
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "version")
-
-	_, err = loadYAML(`
-version: "2.0"
-services:
-  foo:
-    image: busybox
-`)
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "version")
-}
-
 func TestInvalidVersion(t *testing.T) {
 	_, err := loadYAML(`
 version: 3
@@ -330,14 +311,6 @@ services:
 	assert.Contains(t, err.Error(), "version must be a string")
 }
 
-func TestV1Unsupported(t *testing.T) {
-	_, err := loadYAML(`
-foo:
-  image: busybox
-`)
-	assert.Error(t, err)
-}
-
 func TestNonMappingObject(t *testing.T) {
 	_, err := loadYAML(`
 version: "3"
@@ -680,7 +653,7 @@ func uint64Ptr(value uint64) *uint64 {
 }
 
 func TestFullExample(t *testing.T) {
-	bytes, err := ioutil.ReadFile("full-example.yml")
+	bytes, err := ioutil.ReadFile("testdata/v3-full-example.yml")
 	require.NoError(t, err)
 
 	homeDir := "/home/foo"
@@ -690,6 +663,7 @@ func TestFullExample(t *testing.T) {
 
 	workingDir, err := os.Getwd()
 	require.NoError(t, err)
+	workingDir = filepath.Join(workingDir, "testdata")
 
 	stopGracePeriod := time.Duration(20 * time.Second)
 
@@ -761,8 +735,8 @@ func TestFullExample(t *testing.T) {
 			"QUX": strPtr("qux_from_environment"),
 		},
 		EnvFile: []string{
-			"./example1.env",
-			"./example2.env",
+			"example1.env",
+			"example2.env",
 		},
 		Expose: []string{"3000", "8000"},
 		ExternalLinks: []string{

cli/compose/loader/loader_v1_test.go

@@ -0,0 +1,37 @@
+package loader
+
+import (
+	"testing"
+	"github.com/stretchr/testify/require"
+)
+
+
+func TestUnsupportedVersion(t *testing.T) {
+	_, err := loadYAML(`
+version: "0.1"
+services:
+  foo:
+    image: busybox
+`)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "version")
+
+	_, err = loadYAML(`
+version: "0.1"
+services:
+  foo:
+    image: busybox
+`)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "version")
+}
+
+
+func TestV1Supported(t *testing.T) {
+	actual, err := loadYAML(`
+foo:
+  image: busybox
+`)
+	require.NoError(t, err)
+	require.Len(t, actual.Services, 1)
+}

cli/compose/loader/loader_v2_test.go

@@ -0,0 +1,18 @@
+package loader
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestV2Supported(t *testing.T) {
+	actual, err := loadYAML(`
+version: "2.0"
+services:
+  foo:
+    image: busybox`)
+
+	require.NoError(t, err)
+	require.Len(t, actual.Services, 1)
+}

cli/compose/loader/example1.env → cli/compose/loader/testdata/example1.env

@@ -4,5 +4,5 @@ FOO=foo_from_env_file
 # overridden in example2.env
 BAR=bar_from_env_file
 
-# overridden in full-example.yml
+# overridden in v3-full-example.yml
 BAZ=baz_from_env_file

cli/compose/loader/testdata/v1-full.yml

@@ -0,0 +1,10 @@
+net:
+  image: busybox
+volume:
+  image: busybox
+  volumes:
+    - /data
+app:
+  image: busybox
+  net: "container:net"
+volumes_from: ["volume"]

cli/compose/loader/testdata/v2-full.yml

@@ -0,0 +1,23 @@
+version: "2"
+
+volumes:
+  data:
+    driver: local
+
+networks:
+  front: {}
+
+services:
+  web:
+    build: .
+    networks:
+      - front
+      - default
+    volumes_from:
+      - other
+
+  other:
+    image: busybox:latest
+    command: top
+    volumes:
+      - /data

cli/compose/loader/full-example.yml → cli/compose/loader/testdata/v3-full-example.yml

@@ -89,8 +89,8 @@ services:
     # String or list
     # env_file: .env
     env_file:
-      - ./example1.env
-      - ./example2.env
+      - example1.env
+      - example2.env
 
     # Mapping or list
     # Mapping values can be strings, numbers or null