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

Reactivated CmdPush in commands.go

Browse source
This commit is contained in:
shin- 2013-04-23 12:02:16 -07:00
parent e179c66400
commit 6644a3c78a
2 changed files with 53 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
commands.go
View file

@ -492,64 +492,65 @@ func (srv *Server) CmdImport(stdin io.ReadCloser, stdout rcli.DockerConn, args .
return nil
}
// func (srv *Server) CmdPush(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {
// cmd := rcli.Subcmd(stdout, "push", "NAME", "Push an image or a repository to the registry")
// if err := cmd.Parse(args); err != nil {
// return nil
// }
// local := cmd.Arg(0)
func (srv *Server) CmdPush(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {
cmd := rcli.Subcmd(stdout, "push", "NAME", "Push an image or a repository to the registry")
registry := cmd.String("registry", "", "Registry host to push the image to")
if err := cmd.Parse(args); err != nil {
return nil
}
local := cmd.Arg(0)
// if local == "" {
// cmd.Usage()
// return nil
// }
if local == "" {
cmd.Usage()
return nil
}
// // If the login failed, abort
// if srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "" {
// if err := srv.CmdLogin(stdin, stdout, args...); err != nil {
// return err
// }
// if srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "" {
// return fmt.Errorf("Please login prior to push. ('docker login')")
// }
// }
// If the login failed AND we're using the index, abort
if *registry == "" && (srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "") {
if err := srv.CmdLogin(stdin, stdout, args...); err != nil {
return err
}
if srv.runtime.authConfig == nil || srv.runtime.authConfig.Username == "" {
return fmt.Errorf("Please login prior to push. ('docker login')")
}
}
// var remote string
var remote string
// tmp := strings.SplitN(local, "/", 2)
// if len(tmp) == 1 {
// return fmt.Errorf(
// "Impossible to push a \"root\" repository. Please rename your repository in <user>/<repo> (ex: %s/%s)",
// srv.runtime.authConfig.Username, local)
// } else {
// remote = local
// }
tmp := strings.SplitN(local, "/", 2)
if len(tmp) == 1 {
return fmt.Errorf(
"Impossible to push a \"root\" repository. Please rename your repository in <user>/<repo> (ex: %s/%s)",
srv.runtime.authConfig.Username, local)
} else {
remote = local
}
// Debugf("Pushing [%s] to [%s]\n", local, remote)
Debugf("Pushing [%s] to [%s]\n", local, remote)
// // Try to get the image
// // FIXME: Handle lookup
// // FIXME: Also push the tags in case of ./docker push myrepo:mytag
// // img, err := srv.runtime.LookupImage(cmd.Arg(0))
// img, err := srv.runtime.graph.Get(local)
// if err != nil {
// Debugf("The push refers to a repository [%s] (len: %d)\n", local, len(srv.runtime.repositories.Repositories[local]))
// // If it fails, try to get the repository
// if localRepo, exists := srv.runtime.repositories.Repositories[local]; exists {
// if err := srv.runtime.graph.PushRepository(stdout, remote, localRepo, srv.runtime.authConfig); err != nil {
// return err
// }
// return nil
// }
// Try to get the image
// FIXME: Handle lookup
// FIXME: Also push the tags in case of ./docker push myrepo:mytag
// img, err := srv.runtime.LookupImage(cmd.Arg(0))
img, err := srv.runtime.graph.Get(local)
if err != nil {
Debugf("The push refers to a repository [%s] (len: %d)\n", local, len(srv.runtime.repositories.Repositories[local]))
// If it fails, try to get the repository
if localRepo, exists := srv.runtime.repositories.Repositories[local]; exists {
if err := srv.runtime.graph.PushRepository(stdout, remote, localRepo, srv.runtime.authConfig); err != nil {
return err
}
return nil
}
// return err
// }
// err = srv.runtime.graph.PushImage(stdout, img, srv.runtime.authConfig)
// if err != nil {
// return err
// }
// return nil
// }
return err
}
err = srv.runtime.graph.PushImage(stdout, img, *registry, nil)
if err != nil {
return err
}
return nil
}
func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "pull", "NAME", "Pull an image or a repository from the registry")

2
graph.go
View file

@ -312,7 +312,7 @@ func (graph *Graph) Checksums(repo Repository) ([]map[string]string, error) {
i := 0
for id, sum := range checksums {
result[i] = map[string]string{
"id": id,
"id": id,
"checksum": sum,
}
i++