Added checks in build path for docker-compose import

surajssd · surajssd · commit 8b0e2ec08cde · 2016-07-13T12:01:55.000+05:30
So when build path is resolved, or when it is being converted from relative path to absolute path, a check has been added which checks if the path is already absolute, if it is, no further operations performed and value of Build path is kept unaltered. Fixes openshift#9815
diff --git a/third_party/github.com/docker/libcompose/project/merge.go b/third_party/github.com/docker/libcompose/project/merge.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/Sirupsen/logrus"
@@ -167,6 +168,9 @@ func resolveBuild(inFile string, serviceData rawService) (rawService, error) {
 			return serviceData, nil
 		}
 	}
+	if filepath.IsAbs(build) {
+		return serviceData, nil
+	}
 
 	current := path.Dir(inFile)
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"bytes"`
`6`	`6`	`"fmt"`
`7`	`7`	`"path"`
	`8`	`+ "path/filepath"`
`8`	`9`	`"strings"`
`9`	`10`
`10`	`11`	`"github.com/Sirupsen/logrus"`
`@@ -167,6 +168,9 @@ func resolveBuild(inFile string, serviceData rawService) (rawService, error) {`
`167`	`168`	`return serviceData, nil`
`168`	`169`	`}`
`169`	`170`	`}`
	`171`	`+ if filepath.IsAbs(build) {`
	`172`	`+ return serviceData, nil`
	`173`	`+ }`
`170`	`174`
`171`	`175`	`current := path.Dir(inFile)`
`172`	`176`