Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable ssh forwarding when building a remote target 

- this fixes https://github.com/moby/buildkit/issues/2040 by enabling
ssh forwarding when a remote address is given on the command line, this
is a similar fix to https://github.com/docker/buildx/pull/581

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
This commit is contained in:
Alex Couture-Beil 2021-04-21 11:41:55 -07:00
parent e3dfc2426e
commit af1bb80c34
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cli/command/image/build_buildkit.go
View File

@ -31,6 +31,7 @@ import (
"github.com/moby/buildkit/session/secrets/secretsprovider" "github.com/moby/buildkit/session/secrets/secretsprovider"
"github.com/moby/buildkit/session/sshforward/sshprovider" "github.com/moby/buildkit/session/sshforward/sshprovider"
"github.com/moby/buildkit/util/appcontext" "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/progressui"
"github.com/moby/buildkit/util/progress/progresswriter" "github.com/moby/buildkit/util/progress/progresswriter"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -186,10 +187,15 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
} }
s.Allow(sp) 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 { 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) s.Allow(sshp)
} }
@ -512,3 +518,8 @@ func parseSSH(value string) *sshprovider.AgentConfig {
} }
return &cfg return &cfg
} }
func isGitSSH(url string) bool {
_, gitProtocol := gitutil.ParseProtocol(url)
return gitProtocol == gitutil.SSHProtocol
}