@@ -148,6 +148,10 @@ func (o *DockerComposeOptions) Run() error {

 		return err

 	}

+	template.ObjectLabels = map[string]string{

+		"compose": template.Name,

+	}

+

 	// all the types generated into the template should be known

 	if errs := app.AsVersionedObjects(template.Objects, kapi.Scheme, kapi.Scheme, o.OutputVersions...); len(errs) > 0 {

 		for _, err := range errs {

@@ -18,7 +18,7 @@ func ParseEnvironment(vals ...string) Environment {

 		if i := strings.Index(s, "="); i == -1 {

 			env[s] = ""

 		} else {

-			env[s[:i]] = env[s[i+1:]]

+			env[s[:i]] = s[i+1:]

 		}

 	}

 	return env

@@ -237,6 +237,7 @@ func Generate(paths ...string) (*templateapi.Template, error) {

 		commonMounts := make(map[string]string)

 		for _, k := range pod.List() {

 			v := p.Configs[k]

+			glog.V(4).Infof("compose service: %#v", v)

 			var inputImage *app.ImageRef

 			if len(v.Image) != 0 {

 				image, err := g.FromName(v.Image)

@@ -206,6 +206,9 @@ os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-

 os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml -o name --as-template=other --dry-run' 'template/other'

 os::cmd::expect_failure 'diff --suppress-common-lines -y <(oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml -o yaml) test/fixtures/app-scenarios/docker-compose/complex/docker-compose.imported.yaml | grep -v secret'

+# verify a docker-compose.yml schema 2 resource can be transformed, and that it sets env vars correctly.

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/wordpress/docker-compose.yml -o yaml --as-template=other --dry-run' 'value: wordpress'

+

 # check new-build

 os::cmd::expect_failure_and_text 'oc new-build mysql -o yaml' 'you must specify at least one source repository URL'

 os::cmd::expect_success_and_text 'oc new-build mysql --binary -o yaml --to mysql:bin' 'type: Binary'

new file mode 100644

@@ -0,0 +1,24 @@

+version: "2"

+services:

+  WP:

+    image: "centurylink/wordpress:3.9.1"

+    links:

+      - "DB:DB_1"

+    ports:

+      - "8080:80"

+    environment:

+      - "DB_PASSWORD=pass@word01"

+      - DB_NAME=wordpress

+    dns:

+      - 8.8.8.8

+      - 9.9.9.9

+    hostname: wordpress

+    domainname: wordpress.mysite.com

+  DB:

+    image: "centurylink/mysql:5.5"

+    ports:

+      - "3306:3306"

+    environment:

+      - "MYSQL_ROOT_PASSWORD=pass@word01"

+    mem_limit: "1000000000"

+    cpu_shares: "40"

@@ -27,17 +27,35 @@ var (

 	}

 )

+type rawSchema struct {

+	Version  string        `yaml:"version"`

+	Services rawServiceMap `yaml:"services"`

+}

+

 type rawService map[string]interface{}

 type rawServiceMap map[string]rawService

 func mergeProject(p *Project, file string, bytes []byte) (map[string]*ServiceConfig, error) {

 	configs := make(map[string]*ServiceConfig)

-	datas := make(rawServiceMap)

-	if err := yaml.Unmarshal(bytes, &datas); err != nil {

+	var schema rawSchema

+	if err := yaml.Unmarshal(bytes, &schema); err != nil {

 		return nil, err

 	}

+	var datas = make(rawServiceMap)

+	switch {

+	case schema.Version == "2":

+		datas = schema.Services

+	case len(schema.Version) == 0:

+		datas = make(rawServiceMap)

+		if err := yaml.Unmarshal(bytes, &datas); err != nil {

+			return nil, err

+		}

+	default:

+		return nil, fmt.Errorf("docker-compose file with schema version %q is not supported", schema.Version)

+	}

+

 	if err := interpolate(p.context.EnvironmentLookup, &datas); err != nil {

 		return nil, err

 	}