فهرست منبع

remove utils.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Victor Vieux 11 سال پیش
والد
کامیت
d648708d02
3فایلهای تغییر یافته به همراه2 افزوده شده و 28 حذف شده
  1. 1 11
      pkg/opts/opts.go
  2. 1 1
      server.go
  3. 0 16
      utils.go

+ 1 - 11
pkg/opts/opts.go

@@ -92,22 +92,12 @@ func ValidateAttach(val string) (string, error) {
 }
 }
 
 
 func ValidateLink(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, err
 	}
 	}
 	return val, nil
 	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) {
 func ValidatePath(val string) (string, error) {
 	var containerPath string
 	var containerPath string
 
 

+ 1 - 1
server.go

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

+ 0 - 16
utils.go

@@ -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)
-}