@@ -41,6 +41,7 @@ Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>

 Ken Cochrane <kencochrane@gmail.com>

 Kevin J. Lynagh <kevin@keminglabs.com>

 Louis Opter <kalessin@kalessin.fr>

+Marcus Farkas <toothlessgear@finitebox.com>

 Maxim Treskin <zerthurd@gmail.com>

 Michael Crosby <crosby.michael@gmail.com>

 Mikhail Sobolev <mss@mawhrin.net>

@@ -1,5 +1,25 @@

 # Changelog

+## 0.4.2 (2013-06-17)

+ - Packaging: Bumped version to work around an Ubuntu bug

+

+## 0.4.1 (2013-06-17)

+ + Remote Api: Add flag to enable cross domain requests

+ + Remote Api/Client: Add images and containers sizes in docker ps and docker images

+ + Runtime: Configure dns configuration host-wide with 'docker -d -dns'

+ + Runtime: Detect faulty DNS configuration and replace it with a public default

+ + Runtime: allow docker run <name>:<id>

+ + Runtime: you can now specify public port (ex: -p 80:4500)

+ * Client: allow multiple params in inspect

+ * Client: Print the container id before the hijack in `docker run`

+ * Registry: add regexp check on repo's name

+ * Registry: Move auth to the client

+ * Runtime: improved image removal to garbage-collect unreferenced parents

+ * Vagrantfile: Add the rest api port to vagrantfile's port_forward

+ * Upgrade to Go 1.1

+ - Builder: don't ignore last line in Dockerfile when it doesn't end with \n

+ - Registry: Remove login check on pull

+

 ## 0.4.0 (2013-06-03)

  + Introducing Builder: 'docker build' builds a container, layer by layer, from a source repository containing a Dockerfile

  + Introducing Remote API: control Docker programmatically using a simple HTTP/json API

@@ -16,7 +16,6 @@ to put them - so we put them here :)

 * Unify build commands and regular commands

 * Move source code into src/ subdir for clarity

 * Clean up the Makefile, it's a mess

-* docker buidl: show short IDs

 * docker build: on non-existent local path for ADD, don't show full absolute path on the host

 * mount into /dockerinit rather than /sbin/init

 * docker tag foo REPO:TAG

@@ -17,7 +17,7 @@ endif

 GIT_COMMIT = $(shell git rev-parse --short HEAD)

 GIT_STATUS = $(shell test -n "`git status --porcelain`" && echo "+CHANGES")

-BUILD_OPTIONS = -ldflags "-X main.GIT_COMMIT $(GIT_COMMIT)$(GIT_STATUS)"

+BUILD_OPTIONS = -ldflags "-X main.GITCOMMIT $(GIT_COMMIT)$(GIT_STATUS)"

 SRC_DIR := $(GOPATH)/src

@@ -108,7 +108,7 @@ Note that some methods are community contributions and not yet officially suppor

 * [Ubuntu 12.04 and 12.10 (officially supported)](http://docs.docker.io/en/latest/installation/ubuntulinux/)

 * [Arch Linux](http://docs.docker.io/en/latest/installation/archlinux/)

-* [MacOS X (with Vagrant)](http://docs.docker.io/en/latest/installation/macos/)

+* [Mac OS X (with Vagrant)](http://docs.docker.io/en/latest/installation/vagrant/)

 * [Windows (with Vagrant)](http://docs.docker.io/en/latest/installation/windows/)

 * [Amazon EC2 (with Vagrant)](http://docs.docker.io/en/latest/installation/amazon/)

@@ -181,7 +181,7 @@ Running an irc bouncer

 ----------------------

 ```bash

-BOUNCER_ID=$(docker run -d -p 6667 -u irc shykes/znc $USER $PASSWORD)

+BOUNCER_ID=$(docker run -d -p 6667 -u irc shykes/znc zncrun $USER $PASSWORD)

 echo "Configure your irc client to connect to port $(docker port $BOUNCER_ID 6667) of this machine"

 ```

@@ -216,7 +216,8 @@ PORT=$(docker port $JOB 4444)

 # Connect to the public port via the host's public address

 # Please note that because of how routing works connecting to localhost or 127.0.0.1 $PORT will not work.

-IP=$(ifconfig eth0 | perl -n -e 'if (m/inet addr:([\d\.]+)/g) { print $1 }')

+# Replace *eth0* according to your local interface name.

+IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')

 echo hello world | nc $IP $PORT

 # Verify that the network connection worked

@@ -262,14 +263,14 @@ Setting up a dev environment

 Instructions that have been verified to work on Ubuntu 12.10,

 ```bash

-sudo apt-get -y install lxc wget bsdtar curl golang git

+sudo apt-get -y install lxc curl xz-utils golang git

 export GOPATH=~/go/

 export PATH=$GOPATH/bin:$PATH

 mkdir -p $GOPATH/src/github.com/dotcloud

 cd $GOPATH/src/github.com/dotcloud

-git clone git@github.com:dotcloud/docker.git

+git clone https://github.com/dotcloud/docker.git

 cd docker

 go get -v github.com/dotcloud/docker/...

@@ -3,6 +3,7 @@

 BOX_NAME = ENV['BOX_NAME'] || "ubuntu"

 BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box"

+VF_BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64_vmware_fusion.box"

 AWS_REGION = ENV['AWS_REGION'] || "us-east-1"

 AWS_AMI    = ENV['AWS_AMI']    || "ami-d0f89fb9"

 FORWARD_DOCKER_PORTS = ENV['FORWARD_DOCKER_PORTS']

@@ -67,6 +68,13 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

     rs.image    = /Ubuntu/

   end

+  config.vm.provider :vmware_fusion do |f, override|

+    override.vm.box = BOX_NAME

+    override.vm.box_url = VF_BOX_URI

+    override.vm.synced_folder ".", "/vagrant", disabled: true

+    f.vmx["displayName"] = "docker"

+  end

+

   config.vm.provider :virtualbox do |vb|

     config.vm.box = BOX_NAME

     config.vm.box_url = BOX_URI

@@ -1,7 +1,8 @@

 package docker

 type APIHistory struct {

-	ID        string `json:"Id"`

+	ID        string   `json:"Id"`

+	Tags      []string `json:",omitempty"`

 	Created   int64

 	CreatedBy string `json:",omitempty"`

 }

@@ -1,12 +1,15 @@

 package docker

 import (

+	"bufio"

 	"errors"

 	"fmt"

+	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

 	"os"

 	"os/exec"

+	"path"

 )

 type Archive io.Reader

@@ -20,6 +23,37 @@ const (

 	Xz

 )

+func DetectCompression(source []byte) Compression {

+	for _, c := range source[:10] {

+		utils.Debugf("%x", c)

+	}

+

+	sourceLen := len(source)

+	for compression, m := range map[Compression][]byte{

+		Bzip2: {0x42, 0x5A, 0x68},

+		Gzip:  {0x1F, 0x8B, 0x08},

+		Xz:    {0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00},

+	} {

+		fail := false

+		if len(m) > sourceLen {

+			utils.Debugf("Len too short")

+			continue

+		}

+		i := 0

+		for _, b := range m {

+			if b != source[i] {

+				fail = true

+				break

+			}

+			i++

+		}

+		if !fail {

+			return compression

+		}

+	}

+	return Uncompressed

+}

+

 func (compression *Compression) Flag() string {

 	switch *compression {

 	case Bzip2:

@@ -46,14 +80,43 @@ func (compression *Compression) Extension() string {

 	return ""

 }

+// Tar creates an archive from the directory at `path`, and returns it as a

+// stream of bytes.

 func Tar(path string, compression Compression) (io.Reader, error) {

-	cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-c"+compression.Flag(), ".")

-	return CmdStream(cmd)

+	return TarFilter(path, compression, nil)

+}

+

+// Tar creates an archive from the directory at `path`, only including files whose relative

+// paths are included in `filter`. If `filter` is nil, then all files are included.

+func TarFilter(path string, compression Compression, filter []string) (io.Reader, error) {

+	args := []string{"tar", "-f", "-", "-C", path}

+	if filter == nil {

+		filter = []string{"."}

+	}

+	for _, f := range filter {

+		args = append(args, "-c"+compression.Flag(), f)

+	}

+	return CmdStream(exec.Command(args[0], args[1:]...))

 }

+// Untar reads a stream of bytes from `archive`, parses it as a tar archive,

+// and unpacks it into the directory at `path`.

+// The archive may be compressed with one of the following algorithgms:

+//  identity (uncompressed), gzip, bzip2, xz.

+// FIXME: specify behavior when target path exists vs. doesn't exist.

 func Untar(archive io.Reader, path string) error {

-	cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-x")

-	cmd.Stdin = archive

+

+	bufferedArchive := bufio.NewReaderSize(archive, 10)

+	buf, err := bufferedArchive.Peek(10)

+	if err != nil {

+		return err

+	}

+	compression := DetectCompression(buf)

+

+	utils.Debugf("Archive compression detected: %s", compression.Extension())

+

+	cmd := exec.Command("tar", "-f", "-", "-C", path, "-x"+compression.Flag())

+	cmd.Stdin = bufferedArchive

 	// Hardcode locale environment for predictable outcome regardless of host configuration.

 	//   (see https://github.com/dotcloud/docker/issues/355)

 	cmd.Env = []string{"LANG=en_US.utf-8", "LC_ALL=en_US.utf-8"}

@@ -64,6 +127,86 @@ func Untar(archive io.Reader, path string) error {

 	return nil

 }

+// TarUntar is a convenience function which calls Tar and Untar, with

+// the output of one piped into the other. If either Tar or Untar fails,

+// TarUntar aborts and returns the error.

+func TarUntar(src string, filter []string, dst string) error {

+	utils.Debugf("TarUntar(%s %s %s)", src, filter, dst)

+	archive, err := TarFilter(src, Uncompressed, filter)

+	if err != nil {

+		return err

+	}

+	return Untar(archive, dst)

+}

+

+// UntarPath is a convenience function which looks for an archive

+// at filesystem path `src`, and unpacks it at `dst`.

+func UntarPath(src, dst string) error {

+	if archive, err := os.Open(src); err != nil {

+		return err

+	} else if err := Untar(archive, dst); err != nil {

+		return err

+	}

+	return nil

+}

+

+// CopyWithTar creates a tar archive of filesystem path `src`, and

+// unpacks it at filesystem path `dst`.

+// The archive is streamed directly with fixed buffering and no

+// intermediary disk IO.

+//

+func CopyWithTar(src, dst string) error {

+	srcSt, err := os.Stat(src)

+	if err != nil {

+		return err

+	}

+	var dstExists bool

+	dstSt, err := os.Stat(dst)

+	if err != nil {

+		if !os.IsNotExist(err) {

+			return err

+		}

+	} else {

+		dstExists = true

+	}

+	// Things that can go wrong if the source is a directory

+	if srcSt.IsDir() {

+		// The destination exists and is a regular file

+		if dstExists && !dstSt.IsDir() {

+			return fmt.Errorf("Can't copy a directory over a regular file")

+		}

+		// Things that can go wrong if the source is a regular file

+	} else {

+		utils.Debugf("The destination exists, it's a directory, and doesn't end in /")

+		// The destination exists, it's a directory, and doesn't end in /

+		if dstExists && dstSt.IsDir() && dst[len(dst)-1] != '/' {

+			return fmt.Errorf("Can't copy a regular file over a directory %s |%s|", dst, dst[len(dst)-1])

+		}

+	}

+	// Create the destination

+	var dstDir string

+	if srcSt.IsDir() || dst[len(dst)-1] == '/' {

+		// The destination ends in /, or the source is a directory

+		//   --> dst is the holding directory and needs to be created for -C

+		dstDir = dst

+	} else {

+		// The destination doesn't end in /

+		//   --> dst is the file

+		dstDir = path.Dir(dst)

+	}

+	if !dstExists {

+		// Create the holding directory if necessary

+		utils.Debugf("Creating the holding directory %s", dstDir)

+		if err := os.MkdirAll(dstDir, 0700); err != nil && !os.IsExist(err) {

+			return err

+		}

+	}

+	if !srcSt.IsDir() {

+		return TarUntar(path.Dir(src), []string{path.Base(src)}, dstDir)

+	}

+	return TarUntar(src, nil, dstDir)

+}

+

 // CmdStream executes a command, and returns its stdout as a stream.

 // If the command fails to run or doesn't complete successfully, an error

 // will be returned, including anything written on stderr.

@@ -1,10 +1,13 @@

 package docker

 import (

+	"bytes"

+	"fmt"

 	"io"

 	"io/ioutil"

 	"os"

 	"os/exec"

+	"path"

 	"testing"

 	"time"

 )

@@ -58,20 +61,58 @@ func TestCmdStreamGood(t *testing.T) {

 	}

 }

-func TestTarUntar(t *testing.T) {

-	archive, err := Tar(".", Uncompressed)

+func tarUntar(t *testing.T, origin string, compression Compression) error {

+	archive, err := Tar(origin, compression)

 	if err != nil {

 		t.Fatal(err)

 	}

+

+	buf := make([]byte, 10)

+	if _, err := archive.Read(buf); err != nil {

+		return err

+	}

+	archive = io.MultiReader(bytes.NewReader(buf), archive)

+

+	detectedCompression := DetectCompression(buf)

+	if detectedCompression.Extension() != compression.Extension() {

+		return fmt.Errorf("Wrong compression detected. Actual compression: %s, found %s", compression.Extension(), detectedCompression.Extension())

+	}

+

 	tmp, err := ioutil.TempDir("", "docker-test-untar")

 	if err != nil {

-		t.Fatal(err)

+		return err

 	}

 	defer os.RemoveAll(tmp)

 	if err := Untar(archive, tmp); err != nil {

-		t.Fatal(err)

+		return err

 	}

 	if _, err := os.Stat(tmp); err != nil {

-		t.Fatalf("Error stating %s: %s", tmp, err.Error())

+		return err

+	}

+	return nil

+}

+

+func TestTarUntar(t *testing.T) {

+	origin, err := ioutil.TempDir("", "docker-test-untar-origin")

+	if err != nil {

+		t.Fatal(err)

+	}

+	defer os.RemoveAll(origin)

+	if err := ioutil.WriteFile(path.Join(origin, "1"), []byte("hello world"), 0700); err != nil {

+		t.Fatal(err)

+	}

+	if err := ioutil.WriteFile(path.Join(origin, "2"), []byte("welcome!"), 0700); err != nil {

+		t.Fatal(err)

+	}

+

+	for _, c := range []Compression{

+		Uncompressed,

+		Gzip,

+		Bzip2,

+		Xz,

+	} {

+		if err := tarUntar(t, origin, c); err != nil {

+			t.Fatalf("Error tar/untar for compression %s: %s", c.Extension(), err)

+		}

 	}

 }

@@ -101,6 +101,7 @@ func (b *buildFile) CmdRun(args string) error {

 	if cache, err := b.srv.ImageGetCached(b.image, b.config); err != nil {

 		return err

 	} else if cache != nil {

+		fmt.Fprintf(b.out, " ---> Using cache\n")

 		utils.Debugf("[BUILDER] Use cached version")

 		b.image = cache.ID

 		return nil

@@ -185,6 +186,7 @@ func (b *buildFile) CmdAdd(args string) error {

 		return err

 	}

 	b.tmpContainers[container.ID] = struct{}{}

+	fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(container.ID))

 	if err := container.EnsureMounted(); err != nil {

 		return err

@@ -193,30 +195,26 @@ func (b *buildFile) CmdAdd(args string) error {

 	origPath := path.Join(b.context, orig)

 	destPath := path.Join(container.RootfsPath(), dest)

-

+	// Preserve the trailing '/'

+	if dest[len(dest)-1] == '/' {

+		destPath = destPath + "/"

+	}

 	fi, err := os.Stat(origPath)

 	if err != nil {

 		return err

 	}

 	if fi.IsDir() {

-		if err := os.MkdirAll(destPath, 0700); err != nil {

-			return err

-		}

-

-		files, err := ioutil.ReadDir(path.Join(b.context, orig))

-		if err != nil {

+		if err := CopyWithTar(origPath, destPath); err != nil {

 			return err

 		}

-		for _, fi := range files {

-			if err := utils.CopyDirectory(path.Join(origPath, fi.Name()), path.Join(destPath, fi.Name())); err != nil {

-				return err

-			}

-		}

-	} else {

+		// First try to unpack the source as an archive

+	} else if err := UntarPath(origPath, destPath); err != nil {

+		utils.Debugf("Couldn't untar %s to %s: %s", origPath, destPath, err)

+		// If that fails, just copy it as a regular file

 		if err := os.MkdirAll(path.Dir(destPath), 0700); err != nil {

 			return err

 		}

-		if err := utils.CopyDirectory(origPath, destPath); err != nil {

+		if err := CopyWithTar(origPath, destPath); err != nil {

 			return err

 		}

 	}

@@ -239,6 +237,7 @@ func (b *buildFile) run() (string, error) {

 		return "", err

 	}

 	b.tmpContainers[c.ID] = struct{}{}

+	fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(c.ID))

 	//start the container

 	if err := c.Start(); err != nil {

@@ -265,6 +264,7 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {

 		if cache, err := b.srv.ImageGetCached(b.image, b.config); err != nil {

 			return err

 		} else if cache != nil {

+			fmt.Fprintf(b.out, " ---> Using cache\n")

 			utils.Debugf("[BUILDER] Use cached version")

 			b.image = cache.ID

 			return nil

@@ -278,6 +278,7 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {

 			return err

 		}

 		b.tmpContainers[container.ID] = struct{}{}

+		fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(container.ID))

 		if err := container.EnsureMounted(); err != nil {

 			return err

@@ -318,6 +319,7 @@ func (b *buildFile) Build(dockerfile, context io.Reader) (string, error) {

 		b.context = name

 	}

 	file := bufio.NewReader(dockerfile)

+	stepN := 0

 	for {

 		line, err := file.ReadString('\n')

 		if err != nil {

@@ -338,12 +340,13 @@ func (b *buildFile) Build(dockerfile, context io.Reader) (string, error) {

 		}

 		instruction := strings.ToLower(strings.Trim(tmp[0], " "))

 		arguments := strings.Trim(tmp[1], " ")

-

-		fmt.Fprintf(b.out, "%s %s (%s)\n", strings.ToUpper(instruction), arguments, b.image)

+		stepN += 1

+		// FIXME: only count known instructions as build steps

+		fmt.Fprintf(b.out, "Step %d : %s %s\n", stepN, strings.ToUpper(instruction), arguments)

 		method, exists := reflect.TypeOf(b).MethodByName("Cmd" + strings.ToUpper(instruction[:1]) + strings.ToLower(instruction[1:]))

 		if !exists {

-			fmt.Fprintf(b.out, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))

+			fmt.Fprintf(b.out, "# Skipping unknown instruction %s\n", strings.ToUpper(instruction))

 			continue

 		}

 		ret := method.Func.Call([]reflect.Value{reflect.ValueOf(b), reflect.ValueOf(arguments)})[0].Interface()

@@ -351,10 +354,10 @@ func (b *buildFile) Build(dockerfile, context io.Reader) (string, error) {

 			return "", ret.(error)

 		}

-		fmt.Fprintf(b.out, "===> %v\n", b.image)

+		fmt.Fprintf(b.out, " ---> %v\n", utils.TruncateID(b.image))

 	}

 	if b.image != "" {

-		fmt.Fprintf(b.out, "Build successful.\n===> %s\n", b.image)

+		fmt.Fprintf(b.out, "Successfully built %s\n", utils.TruncateID(b.image))

 		return b.image, nil

 	}

 	return "", fmt.Errorf("An error occured during the build\n")

@@ -23,6 +23,12 @@ from   ` + unitTestImageName + `

 run    sh -c 'echo root:testpass > /tmp/passwd'

 run    mkdir -p /var/run/sshd`

+// FIXME: test building with a context

+

+// FIXME: test building with a local ADD as first command

+

+// FIXME: test building with 2 successive overlapping ADD commands

+

 func TestBuild(t *testing.T) {

 	dockerfiles := []string{Dockerfile, DockerfileNoNewLine}

 	for _, Dockerfile := range dockerfiles {

@@ -29,7 +29,7 @@ import (

 	"unicode"

 )

-const VERSION = "0.4.0"

+const VERSION = "0.4.2"

 var (

 	GITCOMMIT string

@@ -627,7 +627,10 @@ func (cli *DockerCli) CmdHistory(args ...string) error {

 	fmt.Fprintln(w, "ID\tCREATED\tCREATED BY")

 	for _, out := range outs {

-		fmt.Fprintf(w, "%s\t%s ago\t%s\n", out.ID, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.CreatedBy)

+		if out.Tags != nil {

+			out.ID = out.Tags[0]

+		}

+		fmt.Fprintf(w, "%s \t%s ago\t%s\n", out.ID, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.CreatedBy)

 	}

 	w.Flush()

 	return nil

@@ -1058,6 +1061,10 @@ func (cli *DockerCli) CmdAttach(args ...string) error {

 		return err

 	}

+	if !container.State.Running {

+		return fmt.Errorf("Impossible to attach to a stopped container, start it first")

+	}

+

 	splitStderr := container.Config.Tty

 	connections := 1

@@ -1257,16 +1264,6 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 		fmt.Fprintln(os.Stderr, "WARNING: ", warning)

 	}

-	splitStderr := !config.Tty

-

-	connections := 0

-	if config.AttachStdin || config.AttachStdout || (!splitStderr && config.AttachStderr) {

-		connections += 1

-	}

-	if splitStderr && config.AttachStderr {

-		connections += 1

-	}

-

 	//start the container

 	_, _, err = cli.call("POST", "/containers/"+out.ID+"/start", nil)

 	if err != nil {

@@ -1275,19 +1272,11 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 	if !config.AttachStdout && !config.AttachStderr {

 		fmt.Println(out.ID)

-	}

-	if connections > 0 {

-		chErrors := make(chan error, connections)

+	} else {

 		if config.Tty {

 			cli.monitorTtySize(out.ID)

 		}

-		if splitStderr && config.AttachStderr {

-			go func() {

-				chErrors <- cli.hijack("POST", "/containers/"+out.ID+"/attach?logs=1&stream=1&stderr=1", config.Tty, nil, os.Stderr)

-			}()

-		}

-

 		v := url.Values{}

 		v.Set("logs", "1")

 		v.Set("stream", "1")

@@ -1298,19 +1287,12 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 		if config.AttachStdout {

 			v.Set("stdout", "1")

 		}

-		if !splitStderr && config.AttachStderr {

+		if config.AttachStderr {

 			v.Set("stderr", "1")

 		}

-		go func() {

-			chErrors <- cli.hijack("POST", "/containers/"+out.ID+"/attach?"+v.Encode(), config.Tty, os.Stdin, os.Stdout)

-		}()

-		for connections > 0 {

-			err := <-chErrors

-			if err != nil {

-				utils.Debugf("Error hijack: %s", err)

-				return err

-			}

-			connections -= 1

+		if err := cli.hijack("POST", "/containers/"+out.ID+"/attach?"+v.Encode(), config.Tty, os.Stdin, os.Stdout); err != nil {

+			utils.Debugf("Error hijack: %s", err)

+			return err

 		}

 	}

 	return nil

@@ -8,7 +8,7 @@

 echo "Ensuring basic dependencies are installed..."

 apt-get -qq update

-apt-get -qq install lxc wget bsdtar

+apt-get -qq install lxc wget

 echo "Looking in /proc/filesystems to see if we have AUFS support..."

 if grep -q aufs /proc/filesystems

@@ -691,6 +691,7 @@ Get the history of an image

 	   [

 		{

 			"Id":"b750fe79269d",

+			"Tag":["base:latest"],

 			"Created":1364102658,

 			"CreatedBy":"/bin/bash"

 		},

deleted file mode 100644

@@ -1,8 +0,0 @@

-:title: Introduction

-:description: An introduction to docker and standard containers?

-:keywords: containers, lxc, concepts, explanation, docker, documentation

-

-

-:note: This version of the introduction is temporary, just to make sure we don't break the links from the website when the documentation is updated

-

-This document has been moved to  :ref:`introduction`, please update your bookmarks.

\ No newline at end of file

deleted file mode 100644

@@ -1,125 +0,0 @@

-:title: Introduction

-:description: An introduction to docker and standard containers?

-:keywords: containers, lxc, concepts, explanation

-

-Introduction

-============

-

-Docker -- The Linux container runtime

-

-Docker complements LXC with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and repeatability across servers.

-

-Docker is a great building block for automating distributed systems: large-scale web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc.

-

-

-- **Heterogeneous payloads** Any combination of binaries, libraries, configuration files, scripts, virtualenvs, jars, gems, tarballs, you name it. No more juggling between domain-specific tools. Docker can deploy and run them all.

-- **Any server** Docker can run on any x64 machine with a modern linux kernel - whether it's a laptop, a bare metal server or a VM. This makes it perfect for multi-cloud deployments.

-- **Isolation** docker isolates processes from each other and from the underlying host, using lightweight containers.

-- **Repeatability** Because containers are isolated in their own filesystem, they behave the same regardless of where, when, and alongside what they run.

-

-.. image:: images/lego_docker.jpg

-

-

-What is a Standard Container?

-

-Docker defines a unit of software delivery called a Standard Container. The goal of a Standard Container is to encapsulate a software component and all its dependencies in

-a format that is self-describing and portable, so that any compliant runtime can run it without extra dependency, regardless of the underlying machine and the contents of the container.

-

-The spec for Standard Containers is currently work in progress, but it is very straightforward. It mostly defines 1) an image format, 2) a set of standard operations, and 3) an execution environment.

-

-A great analogy for this is the shipping container. Just like Standard Containers are a fundamental unit of software delivery, shipping containers (http://bricks.argz.com/ins/7823-1/12) are a fundamental unit of physical delivery.

-

-Standard operations

-~~~~~~~~~~~~~~~~~~~

-

-Just like shipping containers, Standard Containers define a set of STANDARD OPERATIONS. Shipping containers can be lifted, stacked, locked, loaded, unloaded and labelled. Similarly, standard containers can be started, stopped, copied, snapshotted, downloaded, uploaded and tagged.

-

-

-Content-agnostic

-~~~~~~~~~~~~~~~~~~~

-

-Just like shipping containers, Standard Containers are CONTENT-AGNOSTIC: all standard operations have the same effect regardless of the contents. A shipping container will be stacked in exactly the same way whether it contains Vietnamese powder coffee or spare Maserati parts. Similarly, Standard Containers are started or uploaded in the same way whether they contain a postgres database, a php application with its dependencies and application server, or Java build artifacts.

-

-

-Infrastructure-agnostic

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-Both types of containers are INFRASTRUCTURE-AGNOSTIC: they can be transported to thousands of facilities around the world, and manipulated by a wide variety of equipment. A shipping container can be packed in a factory in Ukraine, transported by truck to the nearest routing center, stacked onto a train, loaded into a German boat by an Australian-built crane, stored in a warehouse at a US facility, etc. Similarly, a standard container can be bundled on my laptop, uploaded to S3, downloaded, run and snapshotted by a build server at Equinix in Virginia, uploaded to 10 staging servers in a home-made Openstack cluster, then sent to 30 production instances across 3 EC2 regions.

-

-

-Designed for automation

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-Because they offer the same standard operations regardless of content and infrastructure, Standard Containers, just like their physical counterpart, are extremely well-suited for automation. In fact, you could say automation is their secret weapon.

-

-Many things that once required time-consuming and error-prone human effort can now be programmed. Before shipping containers, a bag of powder coffee was hauled, dragged, dropped, rolled and stacked by 10 different people in 10 different locations by the time it reached its destination. 1 out of 50 disappeared. 1 out of 20 was damaged. The process was slow, inefficient and cost a fortune - and was entirely different depending on the facility and the type of goods.

-

-Similarly, before Standard Containers, by the time a software component ran in production, it had been individually built, configured, bundled, documented, patched, vendored, templated, tweaked and instrumented by 10 different people on 10 different computers. Builds failed, libraries conflicted, mirrors crashed, post-it notes were lost, logs were misplaced, cluster updates were half-broken. The process was slow, inefficient and cost a fortune - and was entirely different depending on the language and infrastructure provider.

-

-

-Industrial-grade delivery

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-There are 17 million shipping containers in existence, packed with every physical good imaginable. Every single one of them can be loaded on the same boats, by the same cranes, in the same facilities, and sent anywhere in the World with incredible efficiency. It is embarrassing to think that a 30 ton shipment of coffee can safely travel half-way across the World in *less time* than it takes a software team to deliver its code from one datacenter to another sitting 10 miles away.

-

-With Standard Containers we can put an end to that embarrassment, by making INDUSTRIAL-GRADE DELIVERY of software a reality.

-

-

-Standard Container Specification

-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-(TODO)

-

-Image format

-~~~~~~~~~~~~

-

-Standard operations

-~~~~~~~~~~~~~~~~~~~

-

--  Copy

--  Run

--  Stop

--  Wait

--  Commit

--  Attach standard streams

--  List filesystem changes

--  ...

-

-Execution environment

-~~~~~~~~~~~~~~~~~~~~~

-

-Root filesystem

-^^^^^^^^^^^^^^^

-

-Environment variables

-^^^^^^^^^^^^^^^^^^^^^

-

-Process arguments

-^^^^^^^^^^^^^^^^^

-

-Networking

-^^^^^^^^^^

-

-Process namespacing

-^^^^^^^^^^^^^^^^^^^

-

-Resource limits

-^^^^^^^^^^^^^^^

-

-Process monitoring

-^^^^^^^^^^^^^^^^^^

-

-Logging

-^^^^^^^

-

-Signals

-^^^^^^^

-

-Pseudo-terminal allocation

-^^^^^^^^^^^^^^^^^^^^^^^^^^

-

-Security

-^^^^^^^^

-

@@ -20,6 +20,20 @@ import sys, os

 # -- General configuration -----------------------------------------------------

+

+

+# Additional templates that should be rendered to pages, maps page names to

+# template names.

+# the 'redirect_home.html' page redirects using a http meta refresh which, according

+# to official sources is more or less equivalent of a 301.

+

+html_additional_pages = {

+    'concepts/containers': 'redirect_home.html',

+    'concepts/introduction': 'redirect_home.html',

+    }

+

+

+

 # If your documentation needs a minimal Sphinx version, state it here.

 #needs_sphinx = '1.0'

@@ -120,7 +134,11 @@ html_theme_path = ['../theme']

 # The name of an image file (within the static path) to use as favicon of the

 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32

 # pixels large.

-#html_favicon = None

+

+# We use a png favicon. This is not compatible with internet explorer, but looks

+# much better on all other browsers. However, sphynx doesn't like it (it likes

+# .ico better) so we have just put it in the template rather than used this setting

+# html_favicon = 'favicon.png'

 # Add any paths that contain custom static files (such as style sheets) here,

 # relative to this directory. They are copied after the builtin static files,

@@ -138,10 +156,6 @@ html_static_path = ['static_files']

 # Custom sidebar templates, maps document names to template names.

 #html_sidebars = {}

-# Additional templates that should be rendered to pages, maps page names to

-# template names.

-#html_additional_pages = {}

-

 # If false, no module index is generated.

 #html_domain_indices = True

@@ -33,7 +33,7 @@ Installation

     sudo apt-get install python-software-properties

     sudo add-apt-repository ppa:gophers/go

     sudo apt-get update

-    sudo apt-get -y install lxc wget bsdtar curl golang-stable git aufs-tools

+    sudo apt-get -y install lxc xz-utils curl golang-stable git aufs-tools

     export GOPATH=~/go/

     export PATH=$GOPATH/bin:$PATH

@@ -72,7 +72,7 @@ Connect to the host os with the redis-cli.

     docker ps  # grab the new container id

     docker port <container_id> 6379  # grab the external port

-    ifconfig   # grab the host ip address

+    ip addr show   # grab the host ip address

     redis-cli -h <host ipaddress> -p <external port>

     redis 192.168.0.1:49153> set docker awesome

     OK

@@ -59,6 +59,7 @@ The password is 'screencast'

 	 # it has now given us a port to connect to

 	 # we have to connect using a public ip of our host

 	 $ hostname

+	 # *ifconfig* is deprecated, better use *ip addr show* now

 	 $ ifconfig

 	 $ ssh root@192.168.33.10 -p 49153

 	 # Ah! forgot to set root passwd

@@ -70,6 +71,7 @@ The password is 'screencast'

 	 $ docker commit 9e863f0ca0af31c8b951048ba87641d67c382d08d655c2e4879c51410e0fedc1 dhrp/sshd

 	 $ docker run -d -p 22 dhrp/sshd /usr/sbin/sshd -D

 	 $ docker port a0aaa9558c90cf5c7782648df904a82365ebacce523e4acc085ac1213bfe2206 22

+	 # *ifconfig* is deprecated, better use *ip addr show* now

 	 $ ifconfig

 	 $ ssh root@192.168.33.10 -p 49154

 	 # Thanks for watching, Thatcher thatcher@dotcloud.com