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

'docker tag': assign a repository+tag to an image

Browse source
This commit is contained in:
Solomon Hykes 2013-03-22 18:27:18 -07:00
parent 520af226c0
commit bf7602bc09
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
commands.go
View file

@ -389,7 +389,7 @@ func (srv *Server) CmdImport(stdin io.ReadCloser, stdout io.Writer, args ...stri
// Optionally register the image at REPO/TAG // Optionally register the image at REPO/TAG
if repository := cmd.Arg(1); repository != "" { if repository := cmd.Arg(1); repository != "" {
tag := cmd.Arg(2) // Repository will handle an empty tag properly tag := cmd.Arg(2) // Repository will handle an empty tag properly
if err := srv.runtime.repositories.Set(repository, tag, img.Id); err != nil { if err := srv.runtime.repositories.Set(repository, tag, img.Id, true); err != nil {
return err return err
} }
} }
@ -760,6 +760,19 @@ func (p *ports) Set(value string) error {
return nil return nil
} }
func (srv *Server) CmdTag(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "tag", "[OPTIONS] IMAGE REPOSITORY [TAG]", "Tag an image into a repository")
force := cmd.Bool("f", false, "Force")
if err := cmd.Parse(args); err != nil {
return nil
}
if cmd.NArg() < 2 {
cmd.Usage()
return nil
}
return srv.runtime.repositories.Set(cmd.Arg(1), cmd.Arg(2), cmd.Arg(0), *force)
}
func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "run", "[OPTIONS] IMAGE COMMAND [ARG...]", "Run a command in a new container") cmd := rcli.Subcmd(stdout, "run", "[OPTIONS] IMAGE COMMAND [ARG...]", "Run a command in a new container")
fl_user := cmd.String("u", "", "Username or UID") fl_user := cmd.String("u", "", "Username or UID")

2
registry.go
View file

@ -175,7 +175,7 @@ func (graph *Graph) PullRepository(user, repoName, askedTag string, repositories
if err = graph.PullImage(rev, authConfig); err != nil { if err = graph.PullImage(rev, authConfig); err != nil {
return err return err
} }
if err = repositories.Set(repoName, tag, rev); err != nil { if err = repositories.Set(repoName, tag, rev, true); err != nil {
return err return err
} }
} }

2
runtime.go
View file

@ -201,7 +201,7 @@ func (runtime *Runtime) Commit(id, repository, tag string) (*Image, error) {
} }
// Register the image if needed // Register the image if needed
if repository != "" { if repository != "" {
if err := runtime.repositories.Set(repository, tag, img.Id); err != nil { if err := runtime.repositories.Set(repository, tag, img.Id, true); err != nil {
return img, err return img, err
} }
} }

11
tags.go
View file

@ -83,7 +83,11 @@ func (store *TagStore) LookupImage(name string) (*Image, error) {
return img, nil return img, nil
} }
func (store *TagStore) Set(repoName, tag, revision string) error { func (store *TagStore) Set(repoName, tag, imageName string, force bool) error {
img, err := store.LookupImage(imageName)
if err != nil {
return err
}
if tag == "" { if tag == "" {
tag = DEFAULT_TAG tag = DEFAULT_TAG
} }
@ -101,9 +105,12 @@ func (store *TagStore) Set(repoName, tag, revision string) error {
repo = r repo = r
} else { } else {
repo = make(map[string]string) repo = make(map[string]string)
if old, exists := store.Repositories[repoName]; exists && !force {
return fmt.Errorf("Tag %s:%s is already set to %s", repoName, tag, old)
}
store.Repositories[repoName] = repo store.Repositories[repoName] = repo
} }
repo[tag] = revision repo[tag] = img.Id
return store.Save() return store.Save()
} }