p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove utils.go

Browse Source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d648708d02134c3dc6788ad21325224d849b3b8f
Component: engine
This commit is contained in:
Victor Vieux
2014-03-10 21:06:27 +00:00
parent 1023142a13
commit 6a607918e7
3 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/engine/pkg/opts/opts.go
View File

@ -92,22 +92,12 @@ func ValidateAttach(val string) (string, error) {
}
func ValidateLink(val string) (string, error) {
if _, err := parseLink(val); err != nil {
if _, err := utils.PartParser("name:alias", val); err != nil {
return val, err
}
return val, nil
}
// FIXME: this is a duplicate of docker.utils.parseLink.
// it can't be moved to a separate links/ package because
// links depends on Container which is defined in the core.
//
// Links come in the format of
// name:alias
func parseLink(rawLink string) (map[string]string, error) {
return utils.PartParser("name:alias", rawLink)
}
func ValidatePath(val string) (string, error) {
var containerPath string

2
components/engine/server.go
View File

@ -1995,7 +1995,7 @@ func (srv *Server) RegisterLinks(container *runtime.Container, hostConfig *runco
if hostConfig != nil && hostConfig.Links != nil {
for _, l := range hostConfig.Links {
parts, err := parseLink(l)
parts, err := utils.PartParser("name:alias", l)
if err != nil {
return err
}

16
components/engine/utils.go
View File

@ -1,16 +0,0 @@
package docker
import (
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/utils"
)
type Change struct {
archive.Change
}
// Links come in the format of
// name:alias
func parseLink(rawLink string) (map[string]string, error) {
return utils.PartParser("name:alias", rawLink)
}