Enable ssh forwarding when building a remote target

Alex Couture-Beil · Alex Couture-Beil · commit af1bb80c3482 · 2021-08-19T08:54:37.000-07:00
- this fixes moby/buildkit#2040 by enabling ssh forwarding when a remote address is given on the command line, this is a similar fix to docker/buildx#581 Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
diff --git a/cli/command/image/build_buildkit.go b/cli/command/image/build_buildkit.go
@@ -31,6 +31,7 @@ import (
 	"github.com/moby/buildkit/session/secrets/secretsprovider"
 	"github.com/moby/buildkit/session/sshforward/sshprovider"
 	"github.com/moby/buildkit/util/appcontext"
+	"github.com/moby/buildkit/util/gitutil"
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/moby/buildkit/util/progress/progresswriter"
 	"github.com/pkg/errors"
@@ -186,10 +187,15 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
 		}
 		s.Allow(sp)
 	}
-	if len(options.ssh) > 0 {
-		sshp, err := parseSSHSpecs(options.ssh)
+
+	sshSpecs := options.ssh
+	if len(sshSpecs) == 0 && isGitSSH(remote) {
+		sshSpecs = []string{"default"}
+	}
+	if len(sshSpecs) > 0 {
+		sshp, err := parseSSHSpecs(sshSpecs)
 		if err != nil {
-			return errors.Wrapf(err, "could not parse ssh: %v", options.ssh)
+			return errors.Wrapf(err, "could not parse ssh: %v", sshSpecs)
 		}
 		s.Allow(sshp)
 	}
@@ -512,3 +518,8 @@ func parseSSH(value string) *sshprovider.AgentConfig {
 	}
 	return &cfg
 }
+
+func isGitSSH(url string) bool {
+	_, gitProtocol := gitutil.ParseProtocol(url)
+	return gitProtocol == gitutil.SSHProtocol
+}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`	`"github.com/moby/buildkit/session/secrets/secretsprovider"`
`32`	`32`	`"github.com/moby/buildkit/session/sshforward/sshprovider"`
`33`	`33`	`"github.com/moby/buildkit/util/appcontext"`
	`34`	`+ "github.com/moby/buildkit/util/gitutil"`
`34`	`35`	`"github.com/moby/buildkit/util/progress/progressui"`
`35`	`36`	`"github.com/moby/buildkit/util/progress/progresswriter"`
`36`	`37`	`"github.com/pkg/errors"`
`@@ -186,10 +187,15 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {`
`186`	`187`	`}`
`187`	`188`	`s.Allow(sp)`
`188`	`189`	`}`
`189`		`- if len(options.ssh) > 0 {`
`190`		`- sshp, err := parseSSHSpecs(options.ssh)`
	`190`	`+`
	`191`	`+ sshSpecs := options.ssh`
	`192`	`+ if len(sshSpecs) == 0 && isGitSSH(remote) {`
	`193`	`+ sshSpecs = []string{"default"}`
	`194`	`+ }`
	`195`	`+ if len(sshSpecs) > 0 {`
	`196`	`+ sshp, err := parseSSHSpecs(sshSpecs)`
`191`	`197`	`if err != nil {`
`192`		`- return errors.Wrapf(err, "could not parse ssh: %v", options.ssh)`
	`198`	`+ return errors.Wrapf(err, "could not parse ssh: %v", sshSpecs)`
`193`	`199`	`}`
`194`	`200`	`s.Allow(sshp)`
`195`	`201`	`}`
`@@ -512,3 +518,8 @@ func parseSSH(value string) *sshprovider.AgentConfig {`
`512`	`518`	`}`
`513`	`519`	`return &cfg`
`514`	`520`	`}`
	`521`	`+`
	`522`	`+func isGitSSH(url string) bool {`
	`523`	`+ _, gitProtocol := gitutil.ParseProtocol(url)`
	`524`	`+ return gitProtocol == gitutil.SSHProtocol`
	`525`	`+}`