docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Insert version checkers when call NewRegistry()

This commit is contained in:
Nan Monnand Deng 2013-06-28 17:42:04 -04:00
parent 65185a565b
commit 5705a49308
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api_params.go
View File

@ -66,18 +66,6 @@ type APIVersion struct {
GoVersion string `json:",omitempty"` GoVersion string `json:",omitempty"`
} }
func (v *APIVersion) Name() string {
return "docker"
}
func (v *APIVersion) Version() string {
r, err := json.Marshal(v)
if err != nil {
return r.Version
}
return string(r)
}
type APIWait struct { type APIWait struct {
StatusCode int StatusCode int
} }

33
server.go
View File

@ -26,6 +26,33 @@ func (srv *Server) DockerVersion() APIVersion {
} }
} }
type plainVersionChecker struct {
name string
version string
}
func (v *plainVersionChecker) Name() string {
return v.name
}
func (v *plainVersionChecker) Version() string {
return v.version
}
func (srv *Server) versionCheckers() []registry.VersionChecker {
v := srv.DockerVersion()
ret := make([]registry.VersionChecker, 0, 3)
ret = append(ret, &plainVersionChecker{"docker", v.Version})
if len(v.GoVersion) > 0 {
ret = append(ret, &plainVersionChecker{"go", v.GoVersion})
}
if len(v.GitCommit) > 0 {
ret = append(ret, &plainVersionChecker{"git-commit", v.GitCommit})
}
return ret
}
func (srv *Server) ContainerKill(name string) error { func (srv *Server) ContainerKill(name string) error {
if container := srv.runtime.Get(name); container != nil { if container := srv.runtime.Get(name); container != nil {
if err := container.Kill(); err != nil { if err := container.Kill(); err != nil {
@ -55,7 +82,7 @@ func (srv *Server) ContainerExport(name string, out io.Writer) error {
} }
func (srv *Server) ImagesSearch(term string) ([]APISearch, error) { func (srv *Server) ImagesSearch(term string) ([]APISearch, error) {
r, err := registry.NewRegistry(srv.runtime.root, nil, srv.DockerVersion()) r, err := registry.NewRegistry(srv.runtime.root, nil, srv.versionCheckers()...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -470,7 +497,7 @@ func (srv *Server) poolRemove(kind, key string) error {
} }
func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *utils.StreamFormatter, authConfig *auth.AuthConfig) error { func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *utils.StreamFormatter, authConfig *auth.AuthConfig) error {
r, err := registry.NewRegistry(srv.runtime.root, authConfig, srv.DockerVersion()) r, err := registry.NewRegistry(srv.runtime.root, authConfig, srv.versionCheckers()...)
if err != nil { if err != nil {
return err return err
} }
@ -687,7 +714,7 @@ func (srv *Server) ImagePush(localName string, out io.Writer, sf *utils.StreamFo
out = utils.NewWriteFlusher(out) out = utils.NewWriteFlusher(out)
img, err := srv.runtime.graph.Get(localName) img, err := srv.runtime.graph.Get(localName)
r, err2 := registry.NewRegistry(srv.runtime.root, authConfig, srv.DockerVersion()) r, err2 := registry.NewRegistry(srv.runtime.root, authConfig, srv.versionCheckers()...)
if err2 != nil { if err2 != nil {
return err2 return err2
} }