mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
api: client: build: do not fall through if git isn't installed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
parent
30e42a2799
commit
167cc42986
2 changed files with 19 additions and 4 deletions
|
@ -81,9 +81,6 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
|||
err error
|
||||
)
|
||||
|
||||
_, err = exec.LookPath("git")
|
||||
hasGit := err == nil
|
||||
|
||||
specifiedContext := cmd.Arg(0)
|
||||
|
||||
var (
|
||||
|
@ -104,7 +101,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
|||
switch {
|
||||
case specifiedContext == "-":
|
||||
context, relDockerfile, err = getContextFromReader(cli.in, *dockerfileName)
|
||||
case urlutil.IsGitURL(specifiedContext) && hasGit:
|
||||
case urlutil.IsGitURL(specifiedContext):
|
||||
tempDir, relDockerfile, err = getContextFromGitURL(specifiedContext, *dockerfileName)
|
||||
case urlutil.IsURL(specifiedContext):
|
||||
context, relDockerfile, err = getContextFromURL(progBuff, specifiedContext, *dockerfileName)
|
||||
|
@ -503,6 +500,9 @@ func getContextFromReader(r io.ReadCloser, dockerfileName string) (out io.ReadCl
|
|||
// path of the dockerfile in that context directory, and a non-nil error on
|
||||
// success.
|
||||
func getContextFromGitURL(gitURL, dockerfileName string) (absContextDir, relDockerfile string, err error) {
|
||||
if _, err := exec.LookPath("git"); err != nil {
|
||||
return "", "", fmt.Errorf("unable to find 'git': %v", err)
|
||||
}
|
||||
if absContextDir, err = gitutils.Clone(gitURL); err != nil {
|
||||
return "", "", fmt.Errorf("unable to 'git clone' to temporary context directory: %v", err)
|
||||
}
|
||||
|
|
|
@ -6632,3 +6632,18 @@ func (s *DockerSuite) TestBuildCacheRootSource(c *check.C) {
|
|||
|
||||
c.Assert(out, checker.Not(checker.Contains), "Using cache")
|
||||
}
|
||||
|
||||
// #19375
|
||||
func (s *DockerSuite) TestBuildFailsGitNotCallable(c *check.C) {
|
||||
cmd := exec.Command(dockerBinary, "build", "github.com/docker/v1.10-migrator.git")
|
||||
cmd.Env = append(cmd.Env, "PATH=")
|
||||
out, _, err := runCommandWithOutput(cmd)
|
||||
c.Assert(err, checker.NotNil)
|
||||
c.Assert(out, checker.Contains, "unable to prepare context: unable to find 'git': ")
|
||||
|
||||
cmd = exec.Command(dockerBinary, "build", "https://github.com/docker/v1.10-migrator.git")
|
||||
cmd.Env = append(cmd.Env, "PATH=")
|
||||
out, _, err = runCommandWithOutput(cmd)
|
||||
c.Assert(err, checker.NotNil)
|
||||
c.Assert(out, checker.Contains, "unable to prepare context: unable to find 'git': ")
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue