kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

if client has no git, use server

Browse source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-03-05 01:54:08 +00:00
parent 8301fc8e56
commit 0d6275b298
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/client.go
View file

@ -161,6 +161,8 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
err error err error
) )
_, err = exec.LookPath("git")
hasGit := err == nil
if cmd.Arg(0) == "-" { if cmd.Arg(0) == "-" {
// As a special case, 'docker build -' will build from an empty context with the // As a special case, 'docker build -' will build from an empty context with the
// contents of stdin as a Dockerfile // contents of stdin as a Dockerfile
@ -169,7 +171,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
return err return err
} }
context, err = archive.Generate("Dockerfile", string(dockerfile)) context, err = archive.Generate("Dockerfile", string(dockerfile))
} else if utils.IsURL(cmd.Arg(0)) && !utils.IsGIT(cmd.Arg(0)) { } else if utils.IsURL(cmd.Arg(0)) && (!utils.IsGIT(cmd.Arg(0)) || !hasGit) {
isRemote = true isRemote = true
} else { } else {
root := cmd.Arg(0) root := cmd.Arg(0)