kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 

remove job from tag
This commit is contained in:
Doug Davis 2015-04-19 16:02:28 -04:00
parent 2e58350bd6 99f6309b97
commit b1d8ae3824
11 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/server/server.go
View File

@ -611,9 +611,11 @@ func postImagesTag(eng *engine.Engine, version version.Version, w http.ResponseW
return fmt.Errorf("Missing parameter")
}
job := eng.Job("tag", vars["name"], r.Form.Get("repo"), r.Form.Get("tag"))
job.Setenv("force", r.Form.Get("force"))
if err := job.Run(); err != nil {
d := getDaemon(eng)
repo := r.Form.Get("repo")
tag := r.Form.Get("tag")
force := toBool(r.Form.Get("force"))
if err := d.Repositories().Tag(repo, tag, vars["name"], force); err != nil {
return err
}
w.WriteHeader(http.StatusCreated)

2
builder/job.go
View File

@ -166,7 +166,7 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) error {
}
if repoName != "" {
b.Daemon.Repositories().Set(repoName, tag, id, true)
b.Daemon.Repositories().Tag(repoName, tag, id, true)
}
return nil
}

2
daemon/commit.go
View File

@ -101,7 +101,7 @@ func (daemon *Daemon) Commit(container *Container, repository, tag, comment, aut
// Register the image if needed
if repository != "" {
if err := daemon.repositories.Set(repository, tag, img.ID, true); err != nil {
if err := daemon.repositories.Tag(repository, tag, img.ID, true); err != nil {
return img, err
}
}

2
graph/import.go
View File

@ -82,7 +82,7 @@ func (s *TagStore) Import(src string, repo string, tag string, imageImportConfig
}
// Optionally register the image at REPO/TAG
if repo != "" {
if err := s.Set(repo, tag, img.ID, true); err != nil {
if err := s.Tag(repo, tag, img.ID, true); err != nil {
return err
}
}

2
graph/manifest_test.go
View File

@ -135,7 +135,7 @@ func TestManifestTarsumCache(t *testing.T) {
if err := store.graph.Register(img, archive); err != nil {
t.Fatal(err)
}
if err := store.Set(testManifestImageName, testManifestTag, testManifestImageID, false); err != nil {
if err := store.Tag(testManifestImageName, testManifestTag, testManifestImageID, false); err != nil {
t.Fatal(err)
}

4
graph/pull.go
View File

@ -242,7 +242,7 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *
if askedTag != "" && tag != askedTag {
continue
}
if err := s.Set(repoInfo.LocalName, tag, id, true); err != nil {
if err := s.Tag(repoInfo.LocalName, tag, id, true); err != nil {
return err
}
}
@ -610,7 +610,7 @@ func (s *TagStore) pullV2Tag(eng *engine.Engine, r *registry.Session, out io.Wri
}
} else {
// only set the repository/tag -> image ID mapping when pulling by tag (i.e. not by digest)
if err = s.Set(repoInfo.LocalName, tag, downloads[0].img.ID, true); err != nil {
if err = s.Tag(repoInfo.LocalName, tag, downloads[0].img.ID, true); err != nil {
return false, err
}
}

1
graph/service.go
View File

@ -12,7 +12,6 @@ import (
func (s *TagStore) Install(eng *engine.Engine) error {
for name, handler := range map[string]engine.Handler{
"image_set": s.CmdSet,
"tag": s.CmdTag,
"image_get": s.CmdGet,
"image_inspect": s.CmdLookup,
"image_tarlayer": s.CmdTarLayer,

18
graph/tag.go
View File

@ -1,18 +0,0 @@
package graph
import (
"fmt"
"github.com/docker/docker/engine"
)
func (s *TagStore) CmdTag(job *engine.Job) error {
if len(job.Args) != 2 && len(job.Args) != 3 {
return fmt.Errorf("Usage: %s IMAGE REPOSITORY [TAG]\n", job.Name)
}
var tag string
if len(job.Args) == 3 {
tag = job.Args[2]
}
return s.Set(job.Args[1], tag, job.Args[0], job.GetenvBool("force"))
}

2
graph/tags.go
View File

@ -224,7 +224,7 @@ func (store *TagStore) Delete(repoName, ref string) (bool, error) {
return deleted, store.save()
}
func (store *TagStore) Set(repoName, tag, imageName string, force bool) error {
func (store *TagStore) Tag(repoName, tag, imageName string, force bool) error {
return store.SetLoad(repoName, tag, imageName, force, nil)
}

4
graph/tags_unit_test.go
View File

@ -72,7 +72,7 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
if err := graph.Register(img, officialArchive); err != nil {
t.Fatal(err)
}
if err := store.Set(testOfficialImageName, "", testOfficialImageID, false); err != nil {
if err := store.Tag(testOfficialImageName, "", testOfficialImageID, false); err != nil {
t.Fatal(err)
}
privateArchive, err := fakeTar()
@ -83,7 +83,7 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
if err := graph.Register(img, privateArchive); err != nil {
t.Fatal(err)
}
if err := store.Set(testPrivateImageName, "", testPrivateImageID, false); err != nil {
if err := store.Tag(testPrivateImageName, "", testPrivateImageID, false); err != nil {
t.Fatal(err)
}
if err := store.SetDigest(testPrivateImageName, testPrivateImageDigest, testPrivateImageID); err != nil {

3
integration/api_test.go
View File

@ -446,7 +446,8 @@ func TestDeleteImages(t *testing.T) {
initialImages := getImages(eng, t, true, "")
if err := eng.Job("tag", unitTestImageName, "test", "test").Run(); err != nil {
d := getDaemon(eng)
if err := d.Repositories().Tag("test", "test", unitTestImageName, true); err != nil {
t.Fatal(err)
}