Prechádzať zdrojové kódy

restore support for `compose build` with a git URL

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 4 rokov pred
rodič
commit
29179840c3
1 zmenil súbory, kde vykonal 2 pridanie a 1 odobranie
  1. 2 1
      pkg/compose/build.go

+ 2 - 1
pkg/compose/build.go

@@ -30,6 +30,7 @@ import (
 	"github.com/docker/buildx/util/buildflags"
 	xprogress "github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/docker/pkg/urlutil"
 	bclient "github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/auth/authprovider"
@@ -288,7 +289,7 @@ func mergeArgs(m ...types.Mapping) types.Mapping {
 }
 
 func dockerFilePath(context string, dockerfile string) string {
-	if path.IsAbs(dockerfile) {
+	if urlutil.IsGitURL(context) || path.IsAbs(dockerfile) {
 		return dockerfile
 	}
 	return filepath.Join(context, dockerfile)