Merge branch 'graph' of ssh://github.com/dotcloud/docker into graph

This commit is contained in:
Solomon Hykes 2013-03-22 19:22:24 -07:00
commit bc51d961cd
3 changed files with 2 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
.vagrant .vagrant
bin
docker/docker docker/docker
.*.swp .*.swp
a.out a.out

View File

@ -16,8 +16,7 @@ import (
const CONFIGFILE = ".dockercfg" const CONFIGFILE = ".dockercfg"
// the registry server we want to login against // the registry server we want to login against
//const REGISTRY_SERVER = "https://registry.docker.io" const REGISTRY_SERVER = "https://registry.docker.io"
const REGISTRY_SERVER = "http://192.168.56.1:5000"
type AuthConfig struct { type AuthConfig struct {
Username string `json:"username"` Username string `json:"username"`