microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

go fmt

This commit is contained in:
Solomon Hykes 2013-02-26 17:26:46 -08:00
Родитель 4004e86fa9
Коммит aa12da6f50
12 изменённых файлов: 152 добавлений и 168 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
client/client.go
Просмотреть файл

@ -1,8 +1,8 @@
package client package client
import ( import (
"github.com/dotcloud/docker/rcli"
"github.com/dotcloud/docker/future" "github.com/dotcloud/docker/future"
"github.com/dotcloud/docker/rcli"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -112,7 +112,7 @@ func InteractiveMode(scripts ...string) error {
return err return err
} }
io.WriteString(rcfile, "enable -n help\n") io.WriteString(rcfile, "enable -n help\n")
os.Setenv("PATH", tmp + ":" + os.Getenv("PATH")) os.Setenv("PATH", tmp+":"+os.Getenv("PATH"))
os.Setenv("PS1", "\\h docker> ") os.Setenv("PS1", "\\h docker> ")
shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...) shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)
shell.Stdin = os.Stdin shell.Stdin = os.Stdin

172
client/term.go
Просмотреть файл

@ -15,7 +15,6 @@ type Termios struct {
Ospeed uintptr Ospeed uintptr
} }
const ( const (
// Input flags // Input flags
inpck = 0x010 inpck = 0x010
@ -35,113 +34,110 @@ const (
) )
const ( const (
HUPCL = 0x4000 HUPCL = 0x4000
ICANON = 0x100 ICANON = 0x100
ICRNL = 0x100 ICRNL = 0x100
IEXTEN = 0x400 IEXTEN = 0x400
BRKINT = 0x2 BRKINT = 0x2
CFLUSH = 0xf CFLUSH = 0xf
CLOCAL = 0x8000 CLOCAL = 0x8000
CREAD = 0x800 CREAD = 0x800
CS5 = 0x0 CS5 = 0x0
CS6 = 0x100 CS6 = 0x100
CS7 = 0x200 CS7 = 0x200
CS8 = 0x300 CS8 = 0x300
CSIZE = 0x300 CSIZE = 0x300
CSTART = 0x11 CSTART = 0x11
CSTATUS = 0x14 CSTATUS = 0x14
CSTOP = 0x13 CSTOP = 0x13
CSTOPB = 0x400 CSTOPB = 0x400
CSUSP = 0x1a CSUSP = 0x1a
IGNBRK = 0x1 IGNBRK = 0x1
IGNCR = 0x80 IGNCR = 0x80
IGNPAR = 0x4 IGNPAR = 0x4
IMAXBEL = 0x2000 IMAXBEL = 0x2000
INLCR = 0x40 INLCR = 0x40
INPCK = 0x10 INPCK = 0x10
ISIG = 0x80 ISIG = 0x80
ISTRIP = 0x20 ISTRIP = 0x20
IUTF8 = 0x4000 IUTF8 = 0x4000
IXANY = 0x800 IXANY = 0x800
IXOFF = 0x400 IXOFF = 0x400
IXON = 0x200 IXON = 0x200
NOFLSH = 0x80000000 NOFLSH = 0x80000000
OCRNL = 0x10 OCRNL = 0x10
OFDEL = 0x20000 OFDEL = 0x20000
OFILL = 0x80 OFILL = 0x80
ONLCR = 0x2 ONLCR = 0x2
ONLRET = 0x40 ONLRET = 0x40
ONOCR = 0x20 ONOCR = 0x20
ONOEOT = 0x8 ONOEOT = 0x8
OPOST = 0x1 OPOST = 0x1
RENB = 0x1000 RENB = 0x1000
PARMRK = 0x8 PARMRK = 0x8
PARODD = 0x2000 PARODD = 0x2000
TOSTOP = 0x400000 TOSTOP = 0x400000
VDISCARD = 0xf VDISCARD = 0xf
VDSUSP = 0xb VDSUSP = 0xb
VEOF = 0x0 VEOF = 0x0
VEOL = 0x1 VEOL = 0x1
VEOL2 = 0x2 VEOL2 = 0x2
VERASE = 0x3 VERASE = 0x3
VINTR = 0x8 VINTR = 0x8
VKILL = 0x5 VKILL = 0x5
VLNEXT = 0xe VLNEXT = 0xe
VMIN = 0x10 VMIN = 0x10
VQUIT = 0x9 VQUIT = 0x9
VREPRINT = 0x6 VREPRINT = 0x6
VSTART = 0xc VSTART = 0xc
VSTATUS = 0x12 VSTATUS = 0x12
VSTOP = 0xd VSTOP = 0xd
VSUSP = 0xa VSUSP = 0xa
VT0 = 0x0 VT0 = 0x0
VT1 = 0x10000 VT1 = 0x10000
VTDLY = 0x10000 VTDLY = 0x10000
VTIME = 0x11 VTIME = 0x11
ECHO = 0x00000008 ECHO = 0x00000008
PENDIN = 0x20000000 PENDIN = 0x20000000
) )
type State struct { type State struct {
termios Termios termios Termios
} }
// IsTerminal returns true if the given file descriptor is a terminal. // IsTerminal returns true if the given file descriptor is a terminal.
func IsTerminal(fd int) bool { func IsTerminal(fd int) bool {
var termios Termios var termios Termios
_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0) _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
return err == 0 return err == 0
} }
// MakeRaw put the terminal connected to the given file descriptor into raw // MakeRaw put the terminal connected to the given file descriptor into raw
// mode and returns the previous state of the terminal so that it can be // mode and returns the previous state of the terminal so that it can be
// restored. // restored.
func MakeRaw(fd int) (*State, error) { func MakeRaw(fd int) (*State, error) {
var oldState State var oldState State
if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 { if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
return nil, err return nil, err
} }
newState := oldState.termios newState := oldState.termios
newState.Iflag &^= ISTRIP | INLCR | IGNCR | IXON | IXOFF newState.Iflag &^= ISTRIP | INLCR | IGNCR | IXON | IXOFF
newState.Iflag |= ICRNL newState.Iflag |= ICRNL
newState.Oflag |= ONLCR newState.Oflag |= ONLCR
newState.Lflag &^= ECHO | ICANON | ISIG newState.Lflag &^= ECHO | ICANON | ISIG
if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 { if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
return nil, err return nil, err
} }
return &oldState, nil return &oldState, nil
} }
// Restore restores the terminal connected to the given file descriptor to a // Restore restores the terminal connected to the given file descriptor to a
// previous state. // previous state.
func Restore(fd int, state *State) error { func Restore(fd int, state *State) error {
_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0) _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
return err return err
} }

3
docker/docker.go
Просмотреть файл

@ -2,10 +2,10 @@ package main
import ( import (
"flag" "flag"
"github.com/dotcloud/docker/client"
"log" "log"
"os" "os"
"path" "path"
"github.com/dotcloud/docker/client"
) )
func main() { func main() {
@ -27,4 +27,3 @@ func main() {
} }
} }
} }

16
fake/fake.go
Просмотреть файл

@ -1,20 +1,19 @@
package fake package fake
import ( import (
"bytes"
"math/rand"
"io"
"archive/tar" "archive/tar"
"os/exec" "bytes"
"github.com/kr/pty" "github.com/kr/pty"
"io"
"math/rand"
"os/exec"
) )
func FakeTar() (io.Reader, error) { func FakeTar() (io.Reader, error) {
content := []byte("Hello world!\n") content := []byte("Hello world!\n")
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
tw := tar.NewWriter(buf) tw := tar.NewWriter(buf)
for _, name := range []string {"hello", "etc/postgres/postgres.conf", "etc/passwd", "var/log/postgres/postgres.conf"} { for _, name := range []string{"hello", "etc/postgres/postgres.conf", "etc/passwd", "var/log/postgres/postgres.conf"} {
hdr := new(tar.Header) hdr := new(tar.Header)
hdr.Size = int64(len(content)) hdr.Size = int64(len(content))
hdr.Name = name hdr.Name = name
@ -27,7 +26,6 @@ func FakeTar() (io.Reader, error) {
return buf, nil return buf, nil
} }
func WriteFakeTar(dst io.Writer) error { func WriteFakeTar(dst io.Writer) error {
if data, err := FakeTar(); err != nil { if data, err := FakeTar(); err != nil {
return err return err
@ -37,7 +35,6 @@ func WriteFakeTar(dst io.Writer) error {
return nil return nil
} }
func RandomBytesChanged() uint { func RandomBytesChanged() uint {
return uint(rand.Int31n(24 * 1024 * 1024)) return uint(rand.Int31n(24 * 1024 * 1024))
} }
@ -54,7 +51,6 @@ func ContainerRunning() bool {
return false return false
} }
func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadCloser, error) { func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadCloser, error) {
if interactive { if interactive {
term, err := pty.Start(cmd) term, err := pty.Start(cmd)
@ -76,5 +72,3 @@ func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadClose
} }
return stdin, stdout, nil return stdin, stdout, nil
} }

2
filesystem.go
Просмотреть файл

@ -3,6 +3,7 @@ package docker
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/dotcloud/docker/image"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@ -10,7 +11,6 @@ import (
"strings" "strings"
"syscall" "syscall"
"time" "time"
"github.com/dotcloud/docker/image"
) )
type Filesystem struct { type Filesystem struct {

25
future/future.go
Просмотреть файл

@ -1,12 +1,12 @@
package future package future
import ( import (
"crypto/sha256"
"io"
"fmt"
"time"
"bytes" "bytes"
"crypto/sha256"
"fmt"
"io"
"math/rand" "math/rand"
"time"
) )
func Seed() { func Seed() {
@ -30,18 +30,18 @@ func HumanDuration(d time.Duration) string {
return "About a minute" return "About a minute"
} else if minutes < 60 { } else if minutes < 60 {
return fmt.Sprintf("%d minutes", minutes) return fmt.Sprintf("%d minutes", minutes)
} else if hours := int(d.Hours()); hours == 1{ } else if hours := int(d.Hours()); hours == 1 {
return "About an hour" return "About an hour"
} else if hours < 48 { } else if hours < 48 {
return fmt.Sprintf("%d hours", hours) return fmt.Sprintf("%d hours", hours)
} else if hours < 24 * 7 * 2 { } else if hours < 24*7*2 {
return fmt.Sprintf("%d days", hours / 24) return fmt.Sprintf("%d days", hours/24)
} else if hours < 24 * 30 * 3 { } else if hours < 24*30*3 {
return fmt.Sprintf("%d weeks", hours / 24 / 7) return fmt.Sprintf("%d weeks", hours/24/7)
} else if hours < 24 * 365 * 2 { } else if hours < 24*365*2 {
return fmt.Sprintf("%d months", hours / 24 / 30) return fmt.Sprintf("%d months", hours/24/30)
} }
return fmt.Sprintf("%d years", d.Hours() / 24 / 365) return fmt.Sprintf("%d years", d.Hours()/24/365)
} }
func randomBytes() io.Reader { func randomBytes() io.Reader {
@ -83,4 +83,3 @@ func Pv(src io.Reader, info io.Writer) io.Reader {
}() }()
return r return r
} }

12
image/archive.go
Просмотреть файл

@ -1,30 +1,32 @@
package image package image
import ( import (
"errors"
"io" "io"
"io/ioutil" "io/ioutil"
"os/exec" "os/exec"
"errors"
) )
type Compression uint32 type Compression uint32
const ( const (
Uncompressed Compression = iota Uncompressed Compression = iota
Bzip2 Bzip2
Gzip Gzip
) )
func (compression *Compression) Flag() string { func (compression *Compression) Flag() string {
switch *compression { switch *compression {
case Bzip2: return "j" case Bzip2:
case Gzip: return "z" return "j"
case Gzip:
return "z"
} }
return "" return ""
} }
func Tar(path string, compression Compression) (io.Reader, error) { func Tar(path string, compression Compression) (io.Reader, error) {
cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-c" + compression.Flag(), ".") cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-c"+compression.Flag(), ".")
return CmdStream(cmd) return CmdStream(cmd)
} }

4
image/archive_test.go
Просмотреть файл

@ -1,10 +1,10 @@
package image package image
import ( import (
"testing" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"io/ioutil" "testing"
) )
func TestCmdStreamBad(t *testing.T) { func TestCmdStreamBad(t *testing.T) {

55
image/image.go
Просмотреть файл

@ -1,27 +1,25 @@
package image package image
import ( import (
"encoding/json"
"errors"
"github.com/dotcloud/docker/future"
"io" "io"
"io/ioutil" "io/ioutil"
"encoding/json" "os"
"time"
"path" "path"
"path/filepath" "path/filepath"
"errors"
"sort" "sort"
"os"
"github.com/dotcloud/docker/future"
"strings" "strings"
"time"
) )
type Store struct { type Store struct {
*Index *Index
Root string Root string
Layers *LayerStore Layers *LayerStore
} }
func New(root string) (*Store, error) { func New(root string) (*Store, error) {
abspath, err := filepath.Abs(root) abspath, err := filepath.Abs(root)
if err != nil { if err != nil {
@ -38,8 +36,8 @@ func New(root string) (*Store, error) {
return nil, err return nil, err
} }
return &Store{ return &Store{
Root: abspath, Root: abspath,
Index: NewIndex(path.Join(root, "index.json")), Index: NewIndex(path.Join(root, "index.json")),
Layers: layers, Layers: layers,
}, nil }, nil
} }
@ -73,20 +71,19 @@ func (store *Store) Create(name string, source string, layers ...string) (*Image
return image, nil return image, nil
} }
// Index // Index
type Index struct { type Index struct {
Path string Path string
ByName map[string]*History ByName map[string]*History
ById map[string]*Image ById map[string]*Image
} }
func NewIndex(path string) *Index { func NewIndex(path string) *Index {
return &Index{ return &Index{
Path: path, Path: path,
ByName: make(map[string]*History), ByName: make(map[string]*History),
ById: make(map[string]*Image), ById: make(map[string]*Image),
} }
} }
@ -216,7 +213,7 @@ func (index *Index) Names() []string {
if err := index.load(); err != nil { if err := index.load(); err != nil {
return []string{} return []string{}
} }
var names[]string var names []string
for name := range index.ByName { for name := range index.ByName {
names = append(names, name) names = append(names, name)
} }
@ -279,23 +276,23 @@ func (history *History) Add(image *Image) {
func (history *History) Del(id string) { func (history *History) Del(id string) {
for idx, image := range *history { for idx, image := range *history {
if image.Id == id { if image.Id == id {
*history = append((*history)[:idx], (*history)[idx + 1:]...) *history = append((*history)[:idx], (*history)[idx+1:]...)
} }
} }
} }
type Image struct { type Image struct {
Id string // Globally unique identifier Id string // Globally unique identifier
Layers []string // Absolute paths Layers []string // Absolute paths
Created time.Time Created time.Time
Parent string Parent string
} }
func (image *Image) IdParts() (string, string) { func (image *Image) IdParts() (string, string) {
if len(image.Id) < 8 { if len(image.Id) < 8 {
return "", image.Id return "", image.Id
} }
hash := image.Id[len(image.Id)-8:len(image.Id)] hash := image.Id[len(image.Id)-8 : len(image.Id)]
name := image.Id[:len(image.Id)-9] name := image.Id[:len(image.Id)-9]
return name, hash return name, hash
} }
@ -316,7 +313,7 @@ func generateImageId(name string, layers []string) (string, error) {
for _, layer := range layers { for _, layer := range layers {
ids += path.Base(layer) ids += path.Base(layer)
} }
if h, err := future.ComputeId(strings.NewReader(ids)); err != nil { if h, err := future.ComputeId(strings.NewReader(ids)); err != nil {
return "", err return "", err
} else { } else {
hash = h hash = h
@ -331,9 +328,9 @@ func NewImage(name string, layers []string, parent string) (*Image, error) {
return nil, err return nil, err
} }
return &Image{ return &Image{
Id: id, Id: id,
Layers: layers, Layers: layers,
Created: time.Now(), Created: time.Now(),
Parent: parent, Parent: parent,
}, nil }, nil
} }

17
image/layers.go
Просмотреть файл

@ -2,16 +2,16 @@ package image
import ( import (
"errors" "errors"
"path" "github.com/dotcloud/docker/future"
"path/filepath"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/dotcloud/docker/future" "path"
"path/filepath"
) )
type LayerStore struct { type LayerStore struct {
Root string Root string
} }
func NewLayerStore(root string) (*LayerStore, error) { func NewLayerStore(root string) (*LayerStore, error) {
@ -66,10 +66,9 @@ func (store *LayerStore) Init() error {
return os.Mkdir(store.Root, 0700) return os.Mkdir(store.Root, 0700)
} }
func (store *LayerStore) Mktemp() (string, error) { func (store *LayerStore) Mktemp() (string, error) {
tmpName := future.RandomId() tmpName := future.RandomId()
tmpPath := path.Join(store.Root, "tmp-" + tmpName) tmpPath := path.Join(store.Root, "tmp-"+tmpName)
if err := os.Mkdir(tmpPath, 0700); err != nil { if err := os.Mkdir(tmpPath, 0700); err != nil {
return "", err return "", err
} }
@ -80,7 +79,6 @@ func (store *LayerStore) layerPath(id string) string {
return path.Join(store.Root, id) return path.Join(store.Root, id)
} }
func (store *LayerStore) AddLayer(archive io.Reader) (string, error) { func (store *LayerStore) AddLayer(archive io.Reader) (string, error) {
errors := make(chan error) errors := make(chan error)
// Untar // Untar
@ -109,9 +107,10 @@ func (store *LayerStore) AddLayer(archive io.Reader) (string, error) {
return "", err return "", err
} }
// Wait for goroutines // Wait for goroutines
for i:=0; i<2; i+=1 { for i := 0; i < 2; i += 1 {
select { select {
case err := <-errors: { case err := <-errors:
{
if err != nil { if err != nil {
return "", err return "", err
} }

9
image/layers_test.go
Просмотреть файл

@ -1,12 +1,12 @@
package image package image
import ( import (
"bytes"
"github.com/dotcloud/docker/fake"
"github.com/dotcloud/docker/future"
"io/ioutil"
"os" "os"
"testing" "testing"
"io/ioutil"
"bytes"
"github.com/dotcloud/docker/future"
"github.com/dotcloud/docker/fake"
) )
func TestAddLayer(t *testing.T) { func TestAddLayer(t *testing.T) {
@ -45,4 +45,3 @@ func TestComputeId(t *testing.T) {
t.Fatalf("Identical checksums for difference content (%s == %s)", id1, id2) t.Fatalf("Identical checksums for difference content (%s == %s)", id1, id2)
} }
} }

1
mount_linux.go
Просмотреть файл

@ -2,7 +2,6 @@ package docker
import "syscall" import "syscall"
func mount(source string, target string, fstype string, flags uintptr, data string) (err error) { func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
return syscall.Mount(source, target, fstype, flags, data) return syscall.Mount(source, target, fstype, flags, data)
} }