Use TagImage in Commit

dnephin · dnephin · commit afb3eda697ef · 2018-02-09T20:53:39.000-05:00
Signed-off-by: Daniel Nephin &lt;dnephin@docker.com&gt;
diff --git a/api/server/router/image/backend.go b/api/server/router/image/backend.go
@@ -29,7 +29,7 @@ type imageBackend interface {
 	ImageHistory(imageName string) ([]*image.HistoryResponseItem, error)
 	Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error)
 	LookupImage(name string) (*types.ImageInspect, error)
-	TagImage(imageName, repository, tag string) error
+	TagImage(imageName, repository, tag string) (string, error)
 	ImagesPrune(ctx context.Context, pruneFilters filters.Args) (*types.ImagesPruneReport, error)
 }
 
diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go
@@ -303,7 +303,7 @@ func (s *imageRouter) postImagesTag(ctx context.Context, w http.ResponseWriter,
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
-	if err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {
+	if _, err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {
 		return err
 	}
 	w.WriteHeader(http.StatusCreated)
diff --git a/daemon/commit.go b/daemon/commit.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types/backend"
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder/dockerfile"
@@ -176,9 +175,12 @@ func (daemon *Daemon) CreateImageFromContainer(name string, c *backend.CreateIma
 		return "", err
 	}
 
-	imageRef, err := daemon.tagCommit(c.Repo, c.Tag, id)
-	if err != nil {
-		return "", err
+	var imageRef string
+	if c.Repo != "" {
+		imageRef, err = daemon.TagImage(string(id), c.Repo, c.Tag)
+		if err != nil {
+			return "", err
+		}
 	}
 	daemon.LogContainerEventWithAttributes(container, "commit", map[string]string{
 		"comment":  c.Comment,
@@ -247,30 +249,6 @@ func (daemon *Daemon) commitImage(c backend.CommitConfig) (image.ID, error) {
 	return id, nil
 }
 
-// TODO: remove from Daemon, move to api backend
-func (daemon *Daemon) tagCommit(repo string, tag string, id image.ID) (string, error) {
-	imageRef := ""
-	if repo != "" {
-		newTag, err := reference.ParseNormalizedNamed(repo) // todo: should move this to API layer
-		if err != nil {
-			return "", err
-		}
-		if !reference.IsNameOnly(newTag) {
-			return "", errors.Errorf("unexpected repository name: %s", repo)
-		}
-		if tag != "" {
-			if newTag, err = reference.WithTag(newTag, tag); err != nil {
-				return "", err
-			}
-		}
-		if err := daemon.TagImageWithReference(id, newTag); err != nil {
-			return "", err
-		}
-		imageRef = reference.FamiliarString(newTag)
-	}
-	return imageRef, nil
-}
-
 func exportContainerRw(layerStore layer.Store, id, mountLabel string) (arch io.ReadCloser, err error) {
 	rwlayer, err := layerStore.GetRWLayer(id)
 	if err != nil {
diff --git a/daemon/image_tag.go b/daemon/image_tag.go
@@ -7,23 +7,24 @@ import (
 
 // TagImage creates the tag specified by newTag, pointing to the image named
 // imageName (alternatively, imageName can also be an image ID).
-func (daemon *Daemon) TagImage(imageName, repository, tag string) error {
+func (daemon *Daemon) TagImage(imageName, repository, tag string) (string, error) {
 	imageID, _, err := daemon.GetImageIDAndOS(imageName)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	newTag, err := reference.ParseNormalizedNamed(repository)
 	if err != nil {
-		return err
+		return "", err
 	}
 	if tag != "" {
 		if newTag, err = reference.WithTag(reference.TrimNamed(newTag), tag); err != nil {
-			return err
+			return "", err
 		}
 	}
 
-	return daemon.TagImageWithReference(imageID, newTag)
+	err = daemon.TagImageWithReference(imageID, newTag)
+	return reference.FamiliarString(newTag), err
 }
 
 // TagImageWithReference adds the given reference to the image ID provided.

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type imageBackend interface {`
`29`	`29`	`ImageHistory(imageName string) ([]*image.HistoryResponseItem, error)`
`30`	`30`	`Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error)`
`31`	`31`	`LookupImage(name string) (*types.ImageInspect, error)`
`32`		`- TagImage(imageName, repository, tag string) error`
	`32`	`+ TagImage(imageName, repository, tag string) (string, error)`
`33`	`33`	`ImagesPrune(ctx context.Context, pruneFilters filters.Args) (*types.ImagesPruneReport, error)`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ func (s *imageRouter) postImagesTag(ctx context.Context, w http.ResponseWriter,`
`303`	`303`	`if err := httputils.ParseForm(r); err != nil {`
`304`	`304`	`return err`
`305`	`305`	`}`
`306`		`- if err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {`
	`306`	`+ if _, err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {`
`307`	`307`	`return err`
`308`	`308`	`}`
`309`	`309`	`w.WriteHeader(http.StatusCreated)`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,24 @@ import (`
`7`	`7`
`8`	`8`	`// TagImage creates the tag specified by newTag, pointing to the image named`
`9`	`9`	`// imageName (alternatively, imageName can also be an image ID).`
`10`		`-func (daemon *Daemon) TagImage(imageName, repository, tag string) error {`
	`10`	`+func (daemon *Daemon) TagImage(imageName, repository, tag string) (string, error) {`
`11`	`11`	`imageID, _, err := daemon.GetImageIDAndOS(imageName)`
`12`	`12`	`if err != nil {`
`13`		`- return err`
	`13`	`+ return "", err`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`newTag, err := reference.ParseNormalizedNamed(repository)`
`17`	`17`	`if err != nil {`
`18`		`- return err`
	`18`	`+ return "", err`
`19`	`19`	`}`
`20`	`20`	`if tag != "" {`
`21`	`21`	`if newTag, err = reference.WithTag(reference.TrimNamed(newTag), tag); err != nil {`
`22`		`- return err`
	`22`	`+ return "", err`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- return daemon.TagImageWithReference(imageID, newTag)`
	`26`	`+ err = daemon.TagImageWithReference(imageID, newTag)`
	`27`	`+ return reference.FamiliarString(newTag), err`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`// TagImageWithReference adds the given reference to the image ID provided.`