Merge pull request docker#83 from tonistiigi/relative-dockerfile-path

bake: make dockerfile relative to context
shykes · May 24, 2019 · 0eb2df5 · 0eb2df5
2 parents 4e61674 + f1fd9a2
commit 0eb2df5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/bake/bake.go b/bake/bake.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"io/ioutil"
 	"os"
+	"path"
 	"strings"
 
 	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/util/platformutil"
+	"github.com/docker/docker/pkg/urlutil"
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/pkg/errors"
 )
@@ -275,6 +277,10 @@ func toBuildOpt(t Target) (*build.Options, error) {
 		dockerfilePath = *t.Dockerfile
 	}
 
+	if !isRemoteResource(contextPath) && !path.IsAbs(dockerfilePath) {
+		dockerfilePath = path.Join(contextPath, dockerfilePath)
+	}
+
 	bo := &build.Options{
 		Inputs: build.Inputs{
 			ContextPath:    contextPath,
@@ -394,3 +400,7 @@ func removeDupes(s []string) []string {
 	}
 	return s[:i]
 }
+
+func isRemoteResource(str string) bool {
+	return urlutil.IsGitURL(str) || urlutil.IsURL(str)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -151,8 +151,8 @@ github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
 github.com/docker/distribution/metrics
 # github.com/docker/docker v1.14.0-0.20190410063227-3998dffb806f3887f804b813069f59bc14a7f3c1
-github.com/docker/docker/client
 github.com/docker/docker/pkg/urlutil
+github.com/docker/docker/client
 github.com/docker/docker/api/types
 github.com/docker/docker/api/types/container
 github.com/docker/docker/api/types/network