@@ -2,7 +2,7 @@

 <charles.hooper@dotcloud.com> <chooper@plumata.com> 

 <daniel.mizyrycki@dotcloud.com> <daniel@dotcloud.com>

 <daniel.mizyrycki@dotcloud.com> <mzdaniel@glidelink.net>

-Guillaume J. Charmes <guillaume.charmes@dotcloud.com> creack <charmes.guillaume@gmail.com>

+Guillaume J. Charmes <guillaume.charmes@dotcloud.com> <charmes.guillaume@gmail.com>

 <guillaume.charmes@dotcloud.com> <guillaume@dotcloud.com>

 <kencochrane@gmail.com> <KenCochrane@gmail.com>

 <sridharr@activestate.com> <github@srid.name>

@@ -16,4 +16,6 @@ Tim Terhorst <mynamewastaken+git@gmail.com>

 Andy Smith <github@anarkystic.com>

 <kalessin@kalessin.fr> <louis@dotcloud.com>

 <victor.vieux@dotcloud.com> <victor@dotcloud.com>

+<victor.vieux@dotcloud.com> <dev@vvieux.com>

 <dominik@honnef.co> <dominikh@fork-bomb.org>

+Thatcher Peskens <thatcher@dotcloud.com>

@@ -1,24 +1,34 @@

+Al Tobey <al@ooyala.com>

+Alexey Shamrin <shamrin@gmail.com>

 Andrea Luzzardi <aluzzardi@gmail.com>

 Andy Rothfusz <github@metaliveblog.com>

 Andy Smith <github@anarkystic.com>

 Antony Messerli <amesserl@rackspace.com>

+Barry Allard <barry.allard@gmail.com>

+Brandon Liu <bdon@bdon.org>

 Brian McCallister <brianm@skife.org>

+Bruno Bigras <bigras.bruno@gmail.com>

 Caleb Spare <cespare@gmail.com>

 Charles Hooper <charles.hooper@dotcloud.com>

 Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>

 Daniel Robinson <gottagetmac@gmail.com>

+Daniel Von Fange <daniel@leancoder.com>

 Dominik Honnef <dominik@honnef.co>

 Don Spaulding <donspauldingii@gmail.com>

+Dr Nic Williams <drnicwilliams@gmail.com>

+Evan Wies <evan@neomantra.net>

 ezbercih <cem.ezberci@gmail.com>

 Flavio Castelli <fcastelli@suse.com>

 Francisco Souza <f@souza.cc>

 Frederick F. Kautz IV <fkautz@alumni.cmu.edu>

 Guillaume J. Charmes <guillaume.charmes@dotcloud.com>

+Harley Laue <losinggeneration@gmail.com>

 Hunter Blanks <hunter@twilio.com>

 Jeff Lindsay <progrium@gmail.com>

 Jeremy Grosser <jeremy@synack.me>

 Joffrey F <joffrey@dotcloud.com>

 John Costa <john.costa@gmail.com>

+Jonas Pfenniger <jonas@pfenniger.name>

 Jonathan Rudenberg <jonathan@titanous.com>

 Julien Barbier <write0@gmail.com>

 Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>

@@ -27,8 +37,11 @@ Kevin J. Lynagh <kevin@keminglabs.com>

 Louis Opter <kalessin@kalessin.fr>

 Maxim Treskin <zerthurd@gmail.com>

 Mikhail Sobolev <mss@mawhrin.net>

+Nate Jones <nate@endot.org>

 Nelson Chen <crazysim@gmail.com>

 Niall O'Higgins <niallo@unworkable.org>

+odk- <github@odkurzacz.org>

+Paul Bowsher <pbowsher@globalpersonals.co.uk>

 Paul Hammond <paul@paulhammond.org>

 Piotr Bogdan <ppbogdan@gmail.com>

 Robert Obryk <robryk@gmail.com>

@@ -38,6 +51,8 @@ Silas Sewell <silas@sewell.org>

 Solomon Hykes <solomon@dotcloud.com>

 Sridhar Ratnakumar <sridharr@activestate.com>

 Thatcher Peskens <thatcher@dotcloud.com>

+Thomas Bikeev <thomas.bikeev@mac.com>

+Tianon Gravi <admwiggin@gmail.com>

 Tim Terhorst <mynamewastaken+git@gmail.com>

 Troy Howard <thoward37@gmail.com>

 unclejack <unclejacksons@gmail.com>

@@ -4,8 +4,8 @@ import (

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

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

 	"github.com/gorilla/mux"

-	"github.com/shin-/cookiejar"

 	"io"

 	"log"

 	"net/http"

@@ -34,6 +34,8 @@ func parseForm(r *http.Request) error {

 func httpError(w http.ResponseWriter, err error) {

 	if strings.HasPrefix(err.Error(), "No such") {

 		http.Error(w, err.Error(), http.StatusNotFound)

+	} else if strings.HasPrefix(err.Error(), "Bad parameter") {

+		http.Error(w, err.Error(), http.StatusBadRequest)

 	} else {

 		http.Error(w, err.Error(), http.StatusInternalServerError)

 	}

@@ -44,12 +46,18 @@ func writeJson(w http.ResponseWriter, b []byte) {

 	w.Write(b)

 }

-func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	config := &auth.AuthConfig{

-		Username: srv.runtime.authConfig.Username,

-		Email:    srv.runtime.authConfig.Email,

+func getBoolParam(value string) (bool, error) {

+	if value == "1" || strings.ToLower(value) == "true" {

+		return true, nil

+	}

+	if value == "" || value == "0" || strings.ToLower(value) == "false" {

+		return false, nil

 	}

-	b, err := json.Marshal(config)

+	return false, fmt.Errorf("Bad parameter")

+}

+

+func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+	b, err := json.Marshal(srv.registry.GetAuthConfig())

 	if err != nil {

 		return err

 	}

@@ -63,18 +71,17 @@ func postAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[stri

 		return err

 	}

-	if config.Username == srv.runtime.authConfig.Username {

-		config.Password = srv.runtime.authConfig.Password

+	if config.Username == srv.registry.GetAuthConfig().Username {

+		config.Password = srv.registry.GetAuthConfig().Password

 	}

 	newAuthConfig := auth.NewAuthConfig(config.Username, config.Password, config.Email, srv.runtime.root)

 	status, err := auth.Login(newAuthConfig)

 	if err != nil {

 		return err

-	} else {

-		srv.runtime.graph.getHttpClient().Jar = cookiejar.NewCookieJar()

-		srv.runtime.authConfig = newAuthConfig

 	}

+	srv.registry.ResetClient(newAuthConfig)

+

 	if status != "" {

 		b, err := json.Marshal(&ApiAuth{Status: status})

 		if err != nil {

@@ -116,7 +123,7 @@ func getContainersExport(srv *Server, w http.ResponseWriter, r *http.Request, va

 	name := vars["name"]

 	if err := srv.ContainerExport(name, w); err != nil {

-		Debugf("%s", err.Error())

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

 		return err

 	}

 	return nil

@@ -127,7 +134,10 @@ func getImagesJson(srv *Server, w http.ResponseWriter, r *http.Request, vars map

 		return err

 	}

-	all := r.Form.Get("all") == "1"

+	all, err := getBoolParam(r.Form.Get("all"))

+	if err != nil {

+		return err

+	}

 	filter := r.Form.Get("filter")

 	outs, err := srv.Images(all, filter)

@@ -197,7 +207,10 @@ func getContainersPs(srv *Server, w http.ResponseWriter, r *http.Request, vars m

 	if err := parseForm(r); err != nil {

 		return err

 	}

-	all := r.Form.Get("all") == "1"

+	all, err := getBoolParam(r.Form.Get("all"))

+	if err != nil {

+		return err

+	}

 	since := r.Form.Get("since")

 	before := r.Form.Get("before")

 	n, err := strconv.Atoi(r.Form.Get("limit"))

@@ -224,7 +237,10 @@ func postImagesTag(srv *Server, w http.ResponseWriter, r *http.Request, vars map

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

-	force := r.Form.Get("force") == "1"

+	force, err := getBoolParam(r.Form.Get("force"))

+	if err != nil {

+		return err

+	}

 	if err := srv.ContainerTag(name, repo, tag, force); err != nil {

 		return err

@@ -239,7 +255,7 @@ func postCommit(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st

 	}

 	config := &Config{}

 	if err := json.NewDecoder(r.Body).Decode(config); err != nil {

-		Debugf("%s", err.Error())

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

 	}

 	repo := r.Form.Get("repo")

 	tag := r.Form.Get("tag")

@@ -335,7 +351,6 @@ func postImagesPush(srv *Server, w http.ResponseWriter, r *http.Request, vars ma

 	if err := parseForm(r); err != nil {

 		return err

 	}

-

 	registry := r.Form.Get("registry")

 	if vars == nil {

@@ -363,7 +378,7 @@ func postBuild(srv *Server, w http.ResponseWriter, r *http.Request, vars map[str

 	defer in.Close()

 	fmt.Fprintf(out, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")

 	if err := srv.ImageCreateFromFile(in, out); err != nil {

-		fmt.Fprintln(out, "Error: %s\n", err)

+		fmt.Fprintf(out, "Error: %s\n", err)

 	}

 	return nil

 }

@@ -425,7 +440,10 @@ func deleteContainers(srv *Server, w http.ResponseWriter, r *http.Request, vars

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

-	removeVolume := r.Form.Get("v") == "1"

+	removeVolume, err := getBoolParam(r.Form.Get("v"))

+	if err != nil {

+		return err

+	}

 	if err := srv.ContainerDestroy(name, removeVolume); err != nil {

 		return err

@@ -500,11 +518,27 @@ func postContainersAttach(srv *Server, w http.ResponseWriter, r *http.Request, v

 	if err := parseForm(r); err != nil {

 		return err

 	}

-	logs := r.Form.Get("logs") == "1"

-	stream := r.Form.Get("stream") == "1"

-	stdin := r.Form.Get("stdin") == "1"

-	stdout := r.Form.Get("stdout") == "1"

-	stderr := r.Form.Get("stderr") == "1"

+	logs, err := getBoolParam(r.Form.Get("logs"))

+	if err != nil {

+		return err

+	}

+	stream, err := getBoolParam(r.Form.Get("stream"))

+	if err != nil {

+		return err

+	}

+	stdin, err := getBoolParam(r.Form.Get("stdin"))

+	if err != nil {

+		return err

+	}

+	stdout, err := getBoolParam(r.Form.Get("stdout"))

+	if err != nil {

+		return err

+	}

+	stderr, err := getBoolParam(r.Form.Get("stderr"))

+	if err != nil {

+		return err

+	}

+

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -602,20 +636,20 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 	for method, routes := range m {

 		for route, fct := range routes {

-			Debugf("Registering %s, %s", method, route)

+			utils.Debugf("Registering %s, %s", method, route)

 			// NOTE: scope issue, make sure the variables are local and won't be changed

 			localRoute := route

 			localMethod := method

 			localFct := fct

 			r.Path(localRoute).Methods(localMethod).HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

-				Debugf("Calling %s %s", localMethod, localRoute)

+				utils.Debugf("Calling %s %s", localMethod, localRoute)

 				if logging {

 					log.Println(r.Method, r.RequestURI)

 				}

 				if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {

 					userAgent := strings.Split(r.Header.Get("User-Agent"), "/")

 					if len(userAgent) == 2 && userAgent[1] != VERSION {

-						Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], VERSION)

+						utils.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], VERSION)

 					}

 				}

 				if err := localFct(srv, w, r, mux.Vars(r)); err != nil {

@@ -6,6 +6,8 @@ import (

 	"bytes"

 	"encoding/json"

 	"github.com/dotcloud/docker/auth"

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

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

 	"io"

 	"net"

 	"net/http"

@@ -23,7 +25,10 @@ func TestGetAuth(t *testing.T) {

 	}

 	defer nuke(runtime)

-	srv := &Server{runtime: runtime}

+	srv := &Server{

+		runtime:  runtime,

+		registry: registry.NewRegistry(runtime.root),

+	}

 	r := httptest.NewRecorder()

@@ -46,13 +51,14 @@ func TestGetAuth(t *testing.T) {

 	if err := postAuth(srv, r, req, nil); err != nil {

 		t.Fatal(err)

 	}

+

 	if r.Code != http.StatusOK && r.Code != 0 {

 		t.Fatalf("%d OK or 0 expected, received %d\n", http.StatusOK, r.Code)

 	}

-	if runtime.authConfig.Username != authConfig.Username ||

-		runtime.authConfig.Password != authConfig.Password ||

-		runtime.authConfig.Email != authConfig.Email {

+	newAuthConfig := srv.registry.GetAuthConfig()

+	if newAuthConfig.Username != authConfig.Username ||

+		newAuthConfig.Email != authConfig.Email {

 		t.Fatalf("The auth configuration hasn't been set correctly")

 	}

 }

@@ -143,7 +149,7 @@ func TestGetImagesJson(t *testing.T) {

 	r2 := httptest.NewRecorder()

 	// all=1

-	req2, err := http.NewRequest("GET", "/images/json?all=1", nil)

+	req2, err := http.NewRequest("GET", "/images/json?all=true", nil)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -185,6 +191,24 @@ func TestGetImagesJson(t *testing.T) {

 	if len(images3) != 0 {

 		t.Errorf("Excepted 1 image, %d found", len(images3))

 	}

+

+	r4 := httptest.NewRecorder()

+

+	// all=foobar

+	req4, err := http.NewRequest("GET", "/images/json?all=foobar", nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	err = getImagesJson(srv, r4, req4, nil)

+	if err == nil {

+		t.Fatalf("Error expected, received none")

+	}

+

+	httpError(r4, err)

+	if r4.Code != http.StatusBadRequest {

+		t.Fatalf("%d Bad Request expected, received %d\n", http.StatusBadRequest, r4.Code)

+	}

 }

 func TestGetImagesViz(t *testing.T) {

@@ -222,7 +246,10 @@ func TestGetImagesSearch(t *testing.T) {

 	}

 	defer nuke(runtime)

-	srv := &Server{runtime: runtime}

+	srv := &Server{

+		runtime:  runtime,

+		registry: registry.NewRegistry(runtime.root),

+	}

 	r := httptest.NewRecorder()

@@ -476,13 +503,16 @@ func TestPostAuth(t *testing.T) {

 	}

 	defer nuke(runtime)

-	srv := &Server{runtime: runtime}

+	srv := &Server{

+		runtime:  runtime,

+		registry: registry.NewRegistry(runtime.root),

+	}

 	authConfigOrig := &auth.AuthConfig{

 		Username: "utest",

 		Email:    "utest@yopmail.com",

 	}

-	runtime.authConfig = authConfigOrig

+	srv.registry.ResetClient(authConfigOrig)

 	r := httptest.NewRecorder()

 	if err := getAuth(srv, r, nil, nil); err != nil {

@@ -811,7 +841,7 @@ func TestPostContainersCreate(t *testing.T) {

 	if _, err := os.Stat(path.Join(container.rwPath(), "test")); err != nil {

 		if os.IsNotExist(err) {

-			Debugf("Err: %s", err)

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

 			t.Fatalf("The test file has not been created")

 		}

 		t.Fatal(err)

@@ -15,13 +15,13 @@ import (

 const CONFIGFILE = ".dockercfg"

 // the registry server we want to login against

-const INDEX_SERVER = "https://index.docker.io"

+const INDEX_SERVER = "https://index.docker.io/v1"

 type AuthConfig struct {

 	Username string `json:"username"`

 	Password string `json:"password"`

 	Email    string `json:"email"`

-	rootPath string `json:-`

+	rootPath string

 }

 func NewAuthConfig(username, password, email, rootPath string) *AuthConfig {

@@ -33,6 +33,13 @@ func NewAuthConfig(username, password, email, rootPath string) *AuthConfig {

 	}

 }

+func IndexServerAddress() string {

+	if os.Getenv("DOCKER_INDEX_URL") != "" {

+		return os.Getenv("DOCKER_INDEX_URL") + "/v1"

+	}

+	return INDEX_SERVER

+}

+

 // create a base64 encoded auth string to store in config

 func EncodeAuth(authConfig *AuthConfig) string {

 	authStr := authConfig.Username + ":" + authConfig.Password

@@ -119,7 +126,7 @@ func Login(authConfig *AuthConfig) (string, error) {

 	// using `bytes.NewReader(jsonBody)` here causes the server to respond with a 411 status.

 	b := strings.NewReader(string(jsonBody))

-	req1, err := http.Post(INDEX_SERVER+"/v1/users/", "application/json; charset=utf-8", b)

+	req1, err := http.Post(IndexServerAddress()+"/users/", "application/json; charset=utf-8", b)

 	if err != nil {

 		return "", fmt.Errorf("Server Error: %s", err)

 	}

@@ -139,7 +146,7 @@ func Login(authConfig *AuthConfig) (string, error) {

 			"Please check your e-mail for a confirmation link.")

 	} else if reqStatusCode == 400 {

 		if string(reqBody) == "\"Username or email already exists\"" {

-			req, err := http.NewRequest("GET", INDEX_SERVER+"/v1/users/", nil)

+			req, err := http.NewRequest("GET", IndexServerAddress()+"/users/", nil)

 			req.SetBasicAuth(authConfig.Username, authConfig.Password)

 			resp, err := client.Do(req)

 			if err != nil {

@@ -1,6 +1,10 @@

 package auth

 import (

+	"crypto/rand"

+	"encoding/hex"

+	"os"

+	"strings"

 	"testing"

 )

@@ -21,3 +25,49 @@ func TestEncodeAuth(t *testing.T) {

 		t.Fatal("AuthString encoding isn't correct.")

 	}

 }

+

+func TestLogin(t *testing.T) {

+	os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")

+	defer os.Setenv("DOCKER_INDEX_URL", "")

+	authConfig := NewAuthConfig("unittester", "surlautrerivejetattendrai", "noise+unittester@dotcloud.com", "/tmp")

+	status, err := Login(authConfig)

+	if err != nil {

+		t.Fatal(err)

+	}

+	if status != "Login Succeeded\n" {

+		t.Fatalf("Expected status \"Login Succeeded\", found \"%s\" instead", status)

+	}

+}

+

+func TestCreateAccount(t *testing.T) {

+	os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")

+	defer os.Setenv("DOCKER_INDEX_URL", "")

+	tokenBuffer := make([]byte, 16)

+	_, err := rand.Read(tokenBuffer)

+	if err != nil {

+		t.Fatal(err)

+	}

+	token := hex.EncodeToString(tokenBuffer)[:12]

+	username := "ut" + token

+	authConfig := NewAuthConfig(username, "test42", "docker-ut+"+token+"@example.com", "/tmp")

+	status, err := Login(authConfig)

+	if err != nil {

+		t.Fatal(err)

+	}

+	expectedStatus := "Account created. Please use the confirmation link we sent" +

+		" to your e-mail to activate it.\n"

+	if status != expectedStatus {

+		t.Fatalf("Expected status: \"%s\", found \"%s\" instead.", expectedStatus, status)

+	}

+

+	status, err = Login(authConfig)

+	if err == nil {

+		t.Fatalf("Expected error but found nil instead")

+	}

+

+	expectedError := "Login: Account is not Active"

+

+	if !strings.Contains(err.Error(), expectedError) {

+		t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, err.Error())

+	}

+}

deleted file mode 100644

@@ -1,20 +0,0 @@

-Buildbot

-========

-

-Buildbot is a continuous integration system designed to automate the

-build/test cycle. By automatically rebuilding and testing the tree each time

-something has changed, build problems are pinpointed quickly, before other

-developers are inconvenienced by the failure.

-

-When running 'make hack' at the docker root directory, it spawns a virtual

-machine in the background running a buildbot instance and adds a git

-post-commit hook that automatically run docker tests for you.

-

-You can check your buildbot instance at http://192.168.33.21:8010/waterfall

-

-

-Buildbot dependencies

-

-vagrant, virtualbox packages and python package requests

-

deleted file mode 100644

@@ -1,28 +0,0 @@

-# -*- mode: ruby -*-

-# vi: set ft=ruby :

-

-$BUILDBOT_IP = '192.168.33.21'

-

-def v10(config)

-  config.vm.box = "quantal64_3.5.0-25"

-  config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"

-  config.vm.share_folder 'v-data', '/data/docker', File.dirname(__FILE__) + '/..'

-  config.vm.network :hostonly, $BUILDBOT_IP

-

-  # Ensure puppet is installed on the instance

-  config.vm.provision :shell, :inline => 'apt-get -qq update; apt-get install -y puppet'

-

-  config.vm.provision :puppet do |puppet|

-    puppet.manifests_path = '.'

-    puppet.manifest_file  = 'buildbot.pp'

-    puppet.options = ['--templatedir','.']

-  end

-end

-

-Vagrant::VERSION < '1.1.0' and Vagrant::Config.run do |config|

-  v10(config)

-end

-

-Vagrant::VERSION >= '1.1.0' and Vagrant.configure('1') do |config|

-  v10(config)

-end

deleted file mode 100755

@@ -1,43 +0,0 @@

-#!/bin/bash

-

-# Auto setup of buildbot configuration. Package installation is being done

-# on buildbot.pp

-# Dependencies: buildbot, buildbot-slave, supervisor

-

-SLAVE_NAME='buildworker'

-SLAVE_SOCKET='localhost:9989'

-BUILDBOT_PWD='pass-docker'

-USER='vagrant'

-ROOT_PATH='/data/buildbot'

-DOCKER_PATH='/data/docker'

-BUILDBOT_CFG="$DOCKER_PATH/buildbot/buildbot-cfg"

-IP=$(grep BUILDBOT_IP /data/docker/buildbot/Vagrantfile | awk -F "'" '{ print $2; }')

-

-function run { su $USER -c "$1"; }

-

-export PATH=/bin:sbin:/usr/bin:/usr/sbin:/usr/local/bin

-

-# Exit if buildbot has already been installed

-[ -d "$ROOT_PATH" ] && exit 0

-

-# Setup buildbot

-run "mkdir -p ${ROOT_PATH}"

-cd ${ROOT_PATH}

-run "buildbot create-master master"

-run "cp $BUILDBOT_CFG/master.cfg master"

-run "sed -i 's/localhost/$IP/' master/master.cfg"

-run "buildslave create-slave slave $SLAVE_SOCKET $SLAVE_NAME $BUILDBOT_PWD"

-

-# Allow buildbot subprocesses (docker tests) to properly run in containers,

-# in particular with docker -u

-run "sed -i 's/^umask = None/umask = 000/' ${ROOT_PATH}/slave/buildbot.tac"

-

-# Setup supervisor

-cp $BUILDBOT_CFG/buildbot.conf /etc/supervisor/conf.d/buildbot.conf

-sed -i "s/^chmod=0700.*0700./chmod=0770\nchown=root:$USER/" /etc/supervisor/supervisord.conf

-kill -HUP `pgrep -f "/usr/bin/python /usr/bin/supervisord"`

-

-# Add git hook

-cp $BUILDBOT_CFG/post-commit $DOCKER_PATH/.git/hooks

-sed -i "s/localhost/$IP/" $DOCKER_PATH/.git/hooks/post-commit

-

deleted file mode 100644

@@ -1,32 +0,0 @@

-node default {

-    $USER = 'vagrant'

-    $ROOT_PATH = '/data/buildbot'

-    $DOCKER_PATH = '/data/docker'

-

-    exec {'apt_update': command => '/usr/bin/apt-get update' }

-    Package { require => Exec['apt_update'] }

-    group {'puppet': ensure => 'present'}

-

-    # Install dependencies

-    Package { ensure => 'installed' }

-    package { ['python-dev','python-pip','supervisor','lxc','bsdtar','git','golang']: }

-

-    file{[ '/data' ]:

-        owner => $USER, group => $USER, ensure => 'directory' }

-

-    file {'/var/tmp/requirements.txt':

-        content => template('requirements.txt') }

-

-    exec {'requirements':

-        require => [ Package['python-dev'], Package['python-pip'],

-            File['/var/tmp/requirements.txt'] ],

-        cwd     => '/var/tmp',

-        command => "/bin/sh -c '(/usr/bin/pip install -r requirements.txt;

-            rm /var/tmp/requirements.txt)'" }

-

-    exec {'buildbot-cfg-sh':

-        require => [ Package['supervisor'], Exec['requirements']],

-        path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin',

-        cwd     => '/data',

-        command => "$DOCKER_PATH/buildbot/buildbot-cfg/buildbot-cfg.sh" }

-}

deleted file mode 100644

@@ -1,6 +0,0 @@

-sqlalchemy<=0.7.9

-sqlalchemy-migrate>=0.7.2

-buildbot==0.8.7p1

-buildbot_slave==0.8.7p1

-nose==1.2.1

-requests==1.1.0

@@ -4,6 +4,7 @@ import (

 	"bufio"

 	"encoding/json"

 	"fmt"

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

 	"io"

 	"os"

 	"path"

@@ -45,7 +46,7 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {

 		userConf.PortSpecs = imageConf.PortSpecs

 	}

 	if !userConf.Tty {

-		userConf.Tty = userConf.Tty

+		userConf.Tty = imageConf.Tty

 	}

 	if !userConf.OpenStdin {

 		userConf.OpenStdin = imageConf.OpenStdin

@@ -161,11 +162,11 @@ func (builder *Builder) clearTmp(containers, images map[string]struct{}) {

 	for c := range containers {

 		tmp := builder.runtime.Get(c)

 		builder.runtime.Destroy(tmp)

-		Debugf("Removing container %s", c)

+		utils.Debugf("Removing container %s", c)

 	}

 	for i := range images {

 		builder.runtime.graph.Delete(i)

-		Debugf("Removing image %s", i)

+		utils.Debugf("Removing image %s", i)

 	}

 }

@@ -234,28 +235,29 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e

 			fmt.Fprintf(stdout, "FROM %s\n", arguments)

 			image, err = builder.runtime.repositories.LookupImage(arguments)

 			if err != nil {

-				if builder.runtime.graph.IsNotExist(err) {

-

-					var tag, remote string

-					if strings.Contains(arguments, ":") {

-						remoteParts := strings.Split(arguments, ":")

-						tag = remoteParts[1]

-						remote = remoteParts[0]

-					} else {

-						remote = arguments

-					}

-

-					if err := builder.runtime.graph.PullRepository(stdout, remote, tag, builder.runtime.repositories, builder.runtime.authConfig); err != nil {

-						return nil, err

-					}

-

-					image, err = builder.runtime.repositories.LookupImage(arguments)

-					if err != nil {

-						return nil, err

-					}

-				} else {

-					return nil, err

-				}

+				// if builder.runtime.graph.IsNotExist(err) {

+

+				// 	var tag, remote string

+				// 	if strings.Contains(arguments, ":") {

+				// 		remoteParts := strings.Split(arguments, ":")

+				// 		tag = remoteParts[1]

+				// 		remote = remoteParts[0]

+				// 	} else {

+				// 		remote = arguments

+				// 	}

+

+				// 	panic("TODO: reimplement this")

+				// 	// if err := builder.runtime.graph.PullRepository(stdout, remote, tag, builder.runtime.repositories, builder.runtime.authConfig); err != nil {

+				// 	// 	return nil, err

+				// 	// }

+

+				// 	image, err = builder.runtime.repositories.LookupImage(arguments)

+				// 	if err != nil {

+				// 		return nil, err

+				// 	}

+				// } else {

+				return nil, err

+				// }

 			}

 			config = &Config{}

@@ -286,7 +288,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e

 				break

 			}

-			Debugf("Env -----> %v ------ %v\n", config.Env, env)

+			utils.Debugf("Env -----> %v ------ %v\n", config.Env, env)

 			// Create the container and start it

 			c, err := builder.Create(config)

@@ -410,7 +412,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e

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

 			fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId())

-			file, err := Download(sourceUrl, stdout)

+			file, err := utils.Download(sourceUrl, stdout)

 			if err != nil {

 				return nil, err

 			}

@@ -1,6 +1,7 @@

 package docker

 import (

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

 	"strings"

 	"testing"

 )

@@ -24,7 +25,7 @@ func TestBuild(t *testing.T) {

 	builder := NewBuilder(runtime)

-	img, err := builder.Build(strings.NewReader(Dockerfile), &nopWriter{})

+	img, err := builder.Build(strings.NewReader(Dockerfile), &utils.NopWriter{})

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -7,6 +7,7 @@ import (

 	"fmt"

 	"github.com/dotcloud/docker/auth"

 	"github.com/dotcloud/docker/term"

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

 	"io"

 	"io/ioutil"

 	"net"

@@ -15,6 +16,7 @@ import (

 	"net/url"

 	"os"

 	"path/filepath"

+	"reflect"

 	"strconv"

 	"strings"

 	"text/tabwriter"

@@ -29,50 +31,28 @@ var (

 )

 func ParseCommands(args ...string) error {

-

-	cmds := map[string]func(args ...string) error{

-		"attach":  CmdAttach,

-		"build":   CmdBuild,

-		"commit":  CmdCommit,

-		"diff":    CmdDiff,

-		"export":  CmdExport,

-		"images":  CmdImages,

-		"info":    CmdInfo,

-		"insert":  CmdInsert,

-		"inspect": CmdInspect,

-		"import":  CmdImport,

-		"history": CmdHistory,

-		"kill":    CmdKill,

-		"login":   CmdLogin,

-		"logs":    CmdLogs,

-		"port":    CmdPort,

-		"ps":      CmdPs,

-		"pull":    CmdPull,

-		"push":    CmdPush,

-		"restart": CmdRestart,

-		"rm":      CmdRm,

-		"rmi":     CmdRmi,

-		"run":     CmdRun,

-		"tag":     CmdTag,

-		"search":  CmdSearch,

-		"start":   CmdStart,

-		"stop":    CmdStop,

-		"version": CmdVersion,

-		"wait":    CmdWait,

-	}

+	cli := NewDockerCli("0.0.0.0", 4243)

 	if len(args) > 0 {

-		cmd, exists := cmds[args[0]]

+		methodName := "Cmd" + strings.ToUpper(args[0][:1]) + strings.ToLower(args[0][1:])

+		method, exists := reflect.TypeOf(cli).MethodByName(methodName)

 		if !exists {

 			fmt.Println("Error: Command not found:", args[0])

-			return cmdHelp(args...)

+			return cli.CmdHelp(args...)

 		}

-		return cmd(args[1:]...)

+		ret := method.Func.CallSlice([]reflect.Value{

+			reflect.ValueOf(cli),

+			reflect.ValueOf(args[1:]),

+		})[0].Interface()

+		if ret == nil {

+			return nil

+		}

+		return ret.(error)

 	}

-	return cmdHelp(args...)

+	return cli.CmdHelp(args...)

 }

-func cmdHelp(args ...string) error {

+func (cli *DockerCli) CmdHelp(args ...string) error {

 	help := "Usage: docker COMMAND [arg...]\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n"

 	for _, cmd := range [][]string{

 		{"attach", "Attach to a running container"},

@@ -110,7 +90,7 @@ func cmdHelp(args ...string) error {

 	return nil

 }

-func CmdInsert(args ...string) error {

+func (cli *DockerCli) CmdInsert(args ...string) error {

 	cmd := Subcmd("insert", "IMAGE URL PATH", "Insert a file from URL in the IMAGE at PATH")

 	if err := cmd.Parse(args); err != nil {

 		return nil

@@ -124,20 +104,20 @@ func CmdInsert(args ...string) error {

 	v.Set("url", cmd.Arg(1))

 	v.Set("path", cmd.Arg(2))