docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Allow to docker build URL

Browse Source 
Upstream-commit: 01f446e908305efb86f9cbfbbe3302366a6ccd45
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-06-06 15:56:09 -07:00
parent 9ad1867af2
commit 2d381c7b09
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/engine/commands.go
View File

@@ -157,6 +157,13 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
if cmd.Arg(0) == "-" {
file = os.Stdin
} else if utils.IsURL(cmd.Arg(0)) {
f, err := utils.Download(cmd.Arg(0), ioutil.Discard)
if err != nil {
return err
}
defer f.Body.Close()
file = f.Body
} else {
// Send Dockerfile from arg/Dockerfile (deprecate later)
f, err := os.Open(path.Join(cmd.Arg(0), "Dockerfile"))
@@ -289,15 +296,12 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
return err
}
var out auth.AuthConfig
err = json.Unmarshal(body, &out)
if err != nil {
out := &auth.AuthConfig{}
if err := json.Unmarshal(body, out); err != nil {
return err
}
var username string
var password string
var email string
var username, password, email string
fmt.Print("Username (", out.Username, "): ")
username = readAndEchoString(os.Stdin, os.Stdout)
@@ -330,9 +334,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
return err
}
var out2 APIAuth
err = json.Unmarshal(body, &out2)
if err != nil {
out2 := &APIAuth{}
if err := json.Unmarshal(body, &out2); err != nil {
return err
}
if out2.Status != "" {