Move parsing functions to pkg/parsers and the specific kernel handling
functions to pkg/parsers/kernel, and parsing filters to pkg/parsers/filter. Adjust imports and package references. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh) Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a Component: engine
This commit is contained in:
@ -5,6 +5,7 @@ import (
|
||||
|
||||
"github.com/docker/docker/engine"
|
||||
"github.com/docker/docker/image"
|
||||
"github.com/docker/docker/pkg/parsers"
|
||||
"github.com/docker/docker/utils"
|
||||
)
|
||||
|
||||
@ -78,7 +79,7 @@ func (s *TagStore) CmdTag(job *engine.Job) engine.Status {
|
||||
newName = job.Args[0]
|
||||
oldName = job.Args[1]
|
||||
)
|
||||
newRepo, newTag := utils.ParseRepositoryTag(newName)
|
||||
newRepo, newTag := parsers.ParseRepositoryTag(newName)
|
||||
// FIXME: Set should either parse both old and new name, or neither.
|
||||
// the current prototype is inconsistent.
|
||||
if err := s.Set(newRepo, newTag, oldName, true); err != nil {
|
||||
|
||||
@ -11,6 +11,7 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/docker/docker/image"
|
||||
"github.com/docker/docker/pkg/parsers"
|
||||
"github.com/docker/docker/utils"
|
||||
)
|
||||
|
||||
@ -72,7 +73,7 @@ func (store *TagStore) reload() error {
|
||||
func (store *TagStore) LookupImage(name string) (*image.Image, error) {
|
||||
// FIXME: standardize on returning nil when the image doesn't exist, and err for everything else
|
||||
// (so we can pass all errors here)
|
||||
repos, tag := utils.ParseRepositoryTag(name)
|
||||
repos, tag := parsers.ParseRepositoryTag(name)
|
||||
if tag == "" {
|
||||
tag = DEFAULTTAG
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user