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

go fmt

This commit is contained in:
Andrea Luzzardi 2013-02-13 14:00:36 -08:00
parent e6adfa2bc6
commit 0d46006269
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dockerd/dockerd.go
View File

@ -1,24 +1,24 @@
package main package main
import ( import (
"github.com/dotcloud/docker"
"github.com/dotcloud/docker/rcli"
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/future"
"bufio" "bufio"
"bytes"
"encoding/json"
"errors" "errors"
"log"
"io"
"flag" "flag"
"fmt" "fmt"
"strings" "github.com/dotcloud/docker"
"text/tabwriter" "github.com/dotcloud/docker/future"
"os" "github.com/dotcloud/docker/image"
"time" "github.com/dotcloud/docker/rcli"
"io"
"log"
"net/http" "net/http"
"encoding/json" "os"
"bytes" "strings"
"sync" "sync"
"text/tabwriter"
"time"
) )
const VERSION = "0.0.1" const VERSION = "0.0.1"
@ -173,7 +173,6 @@ func (srv *Server) CmdWrite(stdin io.ReadCloser, stdout io.Writer, args ...strin
return errors.New("No such container: " + name) return errors.New("No such container: " + name)
} }
func (srv *Server) CmdLs(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdLs(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "ls", "[OPTIONS] CONTAINER PATH", "List the contents of a container's directory") cmd := rcli.Subcmd(stdout, "ls", "[OPTIONS] CONTAINER PATH", "List the contents of a container's directory")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
@ -265,7 +264,7 @@ func (srv *Server) CmdRm(stdin io.ReadCloser, stdout io.Writer, args ...string)
return errors.New("No such container: " + name) return errors.New("No such container: " + name)
} }
if err := srv.containers.Destroy(container); err != nil { if err := srv.containers.Destroy(container); err != nil {
fmt.Fprintln(stdout, "Error destroying container " + name + ": " + err.Error()) fmt.Fprintln(stdout, "Error destroying container "+name+": "+err.Error())
} }
} }
return nil return nil
@ -313,7 +312,7 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
nameFilter = flags.Arg(0) nameFilter = flags.Arg(0)
} }
w := tabwriter.NewWriter(stdout, 20, 1, 3, ' ', 0) w := tabwriter.NewWriter(stdout, 20, 1, 3, ' ', 0)
if (!*quiet) { if !*quiet {
fmt.Fprintf(w, "NAME\tID\tCREATED\tPARENT\n") fmt.Fprintf(w, "NAME\tID\tCREATED\tPARENT\n")
} }
for _, name := range srv.images.Names() { for _, name := range srv.images.Names() {
@ -347,7 +346,7 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
} }
} }
} }
if (!*quiet) { if !*quiet {
w.Flush() w.Flush()
} }
return nil return nil
@ -364,7 +363,7 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
return nil return nil
} }
w := tabwriter.NewWriter(stdout, 12, 1, 3, ' ', 0) w := tabwriter.NewWriter(stdout, 12, 1, 3, ' ', 0)
if (!*quiet) { if !*quiet {
fmt.Fprintf(w, "ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tCOMMENT\n") fmt.Fprintf(w, "ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tCOMMENT\n")
} }
for _, container := range srv.containers.List() { for _, container := range srv.containers.List() {
@ -377,7 +376,7 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
if !*fl_full { if !*fl_full {
command = docker.Trunc(command, 20) command = docker.Trunc(command, 20)
} }
for idx, field := range[]string { for idx, field := range []string{
/* ID */ container.Id, /* ID */ container.Id,
/* IMAGE */ container.GetUserData("image"), /* IMAGE */ container.GetUserData("image"),
/* COMMAND */ command, /* COMMAND */ command,
@ -396,7 +395,7 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
stdout.Write([]byte(container.Id + "\n")) stdout.Write([]byte(container.Id + "\n"))
} }
} }
if (!*quiet) { if !*quiet {
w.Flush() w.Flush()
} }
return nil return nil
@ -415,7 +414,6 @@ func (srv *Server) CmdLayers(stdin io.ReadCloser, stdout io.Writer, args ...stri
return nil return nil
} }
func (srv *Server) CmdCp(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdCp(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
flags := rcli.Subcmd(stdout, flags := rcli.Subcmd(stdout,
"cp", "[OPTIONS] IMAGE NAME", "cp", "[OPTIONS] IMAGE NAME",
@ -461,7 +459,6 @@ func (srv *Server) CmdCommit(stdin io.ReadCloser, stdout io.Writer, args ...stri
return errors.New("No such container: " + containerName) return errors.New("No such container: " + containerName)
} }
func (srv *Server) CmdTar(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdTar(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
flags := rcli.Subcmd(stdout, flags := rcli.Subcmd(stdout,
"tar", "CONTAINER", "tar", "CONTAINER",
@ -532,7 +529,6 @@ func (srv *Server) CmdReset(stdin io.ReadCloser, stdout io.Writer, args ...strin
return nil return nil
} }
func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
flags := rcli.Subcmd(stdout, "logs", "[OPTIONS] CONTAINER", "Fetch the logs of a container") flags := rcli.Subcmd(stdout, "logs", "[OPTIONS] CONTAINER", "Fetch the logs of a container")
if err := flags.Parse(args); err != nil { if err := flags.Parse(args); err != nil {
@ -555,7 +551,6 @@ func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string
return errors.New("No such container: " + flags.Arg(0)) return errors.New("No such container: " + flags.Arg(0))
} }
func (srv *Server) CreateContainer(img *image.Image, tty bool, openStdin bool, comment string, cmd string, args ...string) (*docker.Container, error) { func (srv *Server) CreateContainer(img *image.Image, tty bool, openStdin bool, comment string, cmd string, args ...string) (*docker.Container, error) {
id := future.RandomId()[:8] id := future.RandomId()[:8]
container, err := srv.containers.Create(id, cmd, args, img.Layers, container, err := srv.containers.Create(id, cmd, args, img.Layers,
@ -598,7 +593,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
return err return err
} }
wg.Add(1) wg.Add(1)
go func() { io.Copy(c_stdin, stdin); wg.Add(-1); }() go func() { io.Copy(c_stdin, stdin); wg.Add(-1) }()
} }
if *fl_o { if *fl_o {
c_stdout, err := container.StdoutPipe() c_stdout, err := container.StdoutPipe()
@ -606,7 +601,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
return err return err
} }
wg.Add(1) wg.Add(1)
go func() { io.Copy(stdout, c_stdout); wg.Add(-1); }() go func() { io.Copy(stdout, c_stdout); wg.Add(-1) }()
} }
if *fl_e { if *fl_e {
c_stderr, err := container.StderrPipe() c_stderr, err := container.StderrPipe()
@ -614,7 +609,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
return err return err
} }
wg.Add(1) wg.Add(1)
go func() { io.Copy(stdout, c_stderr); wg.Add(-1); }() go func() { io.Copy(stdout, c_stderr); wg.Add(-1) }()
} }
wg.Wait() wg.Wait()
return nil return nil
@ -630,7 +625,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
return nil return nil
} }
name := flags.Arg(0) name := flags.Arg(0)
var cmd[]string var cmd []string
if len(flags.Args()) >= 2 { if len(flags.Args()) >= 2 {
cmd = flags.Args()[1:] cmd = flags.Args()[1:]
} }
@ -663,7 +658,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
if *fl_attach { if *fl_attach {
future.Go(func() error { future.Go(func() error {
log.Printf("CmdRun(): start receiving stdin\n") log.Printf("CmdRun(): start receiving stdin\n")
_, err := io.Copy(cmd_stdin, stdin); _, err := io.Copy(cmd_stdin, stdin)
log.Printf("CmdRun(): done receiving stdin\n") log.Printf("CmdRun(): done receiving stdin\n")
cmd_stdin.Close() cmd_stdin.Close()
return err return err
@ -684,11 +679,11 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
return err return err
} }
sending_stdout := future.Go(func() error { sending_stdout := future.Go(func() error {
_, err := io.Copy(stdout, cmd_stdout); _, err := io.Copy(stdout, cmd_stdout)
return err return err
}) })
sending_stderr := future.Go(func() error { sending_stderr := future.Go(func() error {
_, err := io.Copy(stdout, cmd_stderr); _, err := io.Copy(stdout, cmd_stderr)
return err return err
}) })
err_sending_stdout := <-sending_stdout err_sending_stdout := <-sending_stdout
@ -781,9 +776,7 @@ func (srv *Server) CmdWeb(stdin io.ReadCloser, stdout io.Writer, args ...string)
return nil return nil
} }
type Server struct { type Server struct {
containers *docker.Docker containers *docker.Docker
images *image.Store images *image.Store
} }