diff --git a/go.mod b/go.mod index 286732b4..d8d08c0c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/cloudfoundry/node-engine-cnb require ( github.com/Masterminds/semver v1.4.2 github.com/buildpack/libbuildpack v1.19.0 - github.com/cloudfoundry/dagger v0.0.0-20190705203005-020f9ac2f14e + github.com/cloudfoundry/dagger v0.0.0-20190708210935-79ba5190b629 github.com/cloudfoundry/libcfbuildpack v1.76.0 github.com/onsi/gomega v1.5.0 github.com/sclevine/spec v1.2.0 diff --git a/go.sum b/go.sum index d490ceeb..97f68855 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITg github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/buildpack/libbuildpack v1.19.0 h1:HUkaIwuGmPbQhujBjYNpd+E4f0NdAgAgHq7skydiL5s= github.com/buildpack/libbuildpack v1.19.0/go.mod h1:oxgSTzPbWscHs27iuYrctEZpSak2m/qPThA+9JM0Boo= -github.com/cloudfoundry/dagger v0.0.0-20190705203005-020f9ac2f14e h1:5uEL2c5gNnF3KPZCNIfeVnvHubRkiOi+HYlhz/TJ8fs= -github.com/cloudfoundry/dagger v0.0.0-20190705203005-020f9ac2f14e/go.mod h1:PXeUHc4d2vAVO/31jFE6uD09w/yFfzs4kcayAVEvnEI= +github.com/cloudfoundry/dagger v0.0.0-20190708210935-79ba5190b629 h1:Ij34QrApV5nmYopclohIhB3EFFV76faK+7bhNGpkGRs= +github.com/cloudfoundry/dagger v0.0.0-20190708210935-79ba5190b629/go.mod h1:PXeUHc4d2vAVO/31jFE6uD09w/yFfzs4kcayAVEvnEI= github.com/cloudfoundry/libcfbuildpack v1.76.0 h1:oMTv35mjk5Jogzy2sshVXHyolDWnWHMfANQ0UooXJq0= github.com/cloudfoundry/libcfbuildpack v1.76.0/go.mod h1:QGm+nzixn579dvQNlS7ZQET541y2hEpZ0/5uNxkQ04Y= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= diff --git a/vendor/github.com/cloudfoundry/dagger/buildpack.go b/vendor/github.com/cloudfoundry/dagger/buildpack.go index c5e2f0f2..999df68f 100644 --- a/vendor/github.com/cloudfoundry/dagger/buildpack.go +++ b/vendor/github.com/cloudfoundry/dagger/buildpack.go @@ -34,11 +34,17 @@ func FindBPRoot() (string, error) { if dir == "/" { return "", fmt.Errorf("could not find buildpack.toml in the directory hierarchy") } + // TODO: Take out after transition all cnbs to buildpack.toml.tmpl if exist, err := helper.FileExists(filepath.Join(dir, "buildpack.toml")); err != nil { return "", err } else if exist { return dir, nil } + if exist, err := helper.FileExists(filepath.Join(dir, "buildpack.toml.tmpl")); err != nil { + return "", err + } else if exist { + return dir, nil + } dir, err = filepath.Abs(filepath.Join(dir, "..")) if err != nil { return "", err diff --git a/vendor/modules.txt b/vendor/modules.txt index 8a792ff5..3833be36 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -14,7 +14,7 @@ github.com/buildpack/libbuildpack/logger github.com/buildpack/libbuildpack/platform github.com/buildpack/libbuildpack/services github.com/buildpack/libbuildpack/stack -# github.com/cloudfoundry/dagger v0.0.0-20190705203005-020f9ac2f14e +# github.com/cloudfoundry/dagger v0.0.0-20190708210935-79ba5190b629 github.com/cloudfoundry/dagger # github.com/cloudfoundry/libcfbuildpack v1.76.0 github.com/cloudfoundry/libcfbuildpack/build