kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Make docker client an interface

This commit is contained in:
Guillaume J. Charmes 2013-05-20 16:00:16 -07:00
parent c6bc90d02d
commit b06784b0dd
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
builder_client.go
View File

@ -12,7 +12,13 @@ import (
"strings" "strings"
) )
type BuilderClient struct { type BuilderClient interface {
Build(io.Reader) (string, error)
CmdFrom(string) error
CmdRun(string) error
}
type builderClient struct {
cli *DockerCli cli *DockerCli
image string image string
@ -25,7 +31,7 @@ type BuilderClient struct {
needCommit bool needCommit bool
} }
func (b *BuilderClient) clearTmp(containers, images map[string]struct{}) { func (b builderClient) clearTmp(containers, images map[string]struct{}) {
for c := range containers { for c := range containers {
if _, _, err := b.cli.call("DELETE", "/containers/"+c, nil); err != nil { if _, _, err := b.cli.call("DELETE", "/containers/"+c, nil); err != nil {
utils.Debugf("%s", err) utils.Debugf("%s", err)
@ -40,7 +46,7 @@ func (b *BuilderClient) clearTmp(containers, images map[string]struct{}) {
} }
} }
func (b *BuilderClient) CmdFrom(name string) error { func (b builderClient) CmdFrom(name string) error {
obj, statusCode, err := b.cli.call("GET", "/images/"+name+"/json", nil) obj, statusCode, err := b.cli.call("GET", "/images/"+name+"/json", nil)
if statusCode == 404 { if statusCode == 404 {
if err := b.cli.hijack("POST", "/images/create?fromImage="+name, false); err != nil { if err := b.cli.hijack("POST", "/images/create?fromImage="+name, false); err != nil {
@ -63,13 +69,13 @@ func (b *BuilderClient) CmdFrom(name string) error {
return nil return nil
} }
func (b *BuilderClient) CmdMaintainer(name string) error { func (b builderClient) CmdMaintainer(name string) error {
b.needCommit = true b.needCommit = true
b.maintainer = name b.maintainer = name
return nil return nil
} }
func (b *BuilderClient) CmdRun(args string) error { func (b builderClient) CmdRun(args string) error {
if b.image == "" { if b.image == "" {
return fmt.Errorf("Please provide a source image with `from` prior to run") return fmt.Errorf("Please provide a source image with `from` prior to run")
} }
@ -105,7 +111,7 @@ func (b *BuilderClient) CmdRun(args string) error {
return b.commit(cid) return b.commit(cid)
} }
func (b *BuilderClient) CmdEnv(args string) error { func (b builderClient) CmdEnv(args string) error {
b.needCommit = true b.needCommit = true
tmp := strings.SplitN(args, " ", 2) tmp := strings.SplitN(args, " ", 2)
if len(tmp) != 2 { if len(tmp) != 2 {
@ -124,25 +130,25 @@ func (b *BuilderClient) CmdEnv(args string) error {
return nil return nil
} }
func (b *BuilderClient) CmdCmd(args string) error { func (b builderClient) CmdCmd(args string) error {
b.needCommit = true b.needCommit = true
b.config.Cmd = []string{"/bin/sh", "-c", args} b.config.Cmd = []string{"/bin/sh", "-c", args}
return nil return nil
} }
func (b *BuilderClient) CmdExpose(args string) error { func (b builderClient) CmdExpose(args string) error {
ports := strings.Split(args, " ") ports := strings.Split(args, " ")
b.config.PortSpecs = append(ports, b.config.PortSpecs...) b.config.PortSpecs = append(ports, b.config.PortSpecs...)
return nil return nil
} }
func (b *BuilderClient) CmdInsert(args string) error { func (b builderClient) CmdInsert(args string) error {
// FIXME: Reimplement this once the remove_hijack branch gets merged. // FIXME: Reimplement this once the remove_hijack branch gets merged.
// We need to retrieve the resulting Id // We need to retrieve the resulting Id
return fmt.Errorf("INSERT not implemented") return fmt.Errorf("INSERT not implemented")
} }
func (b *BuilderClient) run() (string, error) { func (b builderClient) run() (string, error) {
if b.image == "" { if b.image == "" {
return "", fmt.Errorf("Please provide a source image with `from` prior to run") return "", fmt.Errorf("Please provide a source image with `from` prior to run")
} }
@ -183,7 +189,7 @@ func (b *BuilderClient) run() (string, error) {
return apiRun.Id, nil return apiRun.Id, nil
} }
func (b *BuilderClient) commit(id string) error { func (b builderClient) commit(id string) error {
if b.image == "" { if b.image == "" {
return fmt.Errorf("Please provide a source image with `from` prior to run") return fmt.Errorf("Please provide a source image with `from` prior to run")
} }
@ -219,7 +225,7 @@ func (b *BuilderClient) commit(id string) error {
return nil return nil
} }
func (b *BuilderClient) Build(dockerfile io.Reader) (string, error) { func (b builderClient) Build(dockerfile io.Reader) (string, error) {
// defer b.clearTmp(tmpContainers, tmpImages) // defer b.clearTmp(tmpContainers, tmpImages)
file := bufio.NewReader(dockerfile) file := bufio.NewReader(dockerfile)
for { for {
@ -274,8 +280,8 @@ func (b *BuilderClient) Build(dockerfile io.Reader) (string, error) {
return "", fmt.Errorf("An error occured during the build\n") return "", fmt.Errorf("An error occured during the build\n")
} }
func NewBuilderClient(addr string, port int) *BuilderClient { func NewBuilderClient(addr string, port int) BuilderClient {
return &BuilderClient{ return &builderClient{
cli: NewDockerCli(addr, port), cli: NewDockerCli(addr, port),
config: &Config{}, config: &Config{},
tmpContainers: make(map[string]struct{}), tmpContainers: make(map[string]struct{}),