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

bump to master

This commit is contained in:
Victor Vieux 2013-05-24 16:50:16 +00:00
parent 92e4a51965 1b5ab5afe0
commit d7b01c049d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api.go
View File

@ -59,7 +59,7 @@ func getBoolParam(value string) (bool, error) {
} }
func getAuth(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func getAuth(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
b, err := json.Marshal(srv.registry.GetAuthConfig()) b, err := json.Marshal(srv.registry.GetAuthConfig(false))
if err != nil { if err != nil {
return err return err
} }
@ -72,9 +72,9 @@ func postAuth(srv *Server, version float64, w http.ResponseWriter, r *http.Reque
if err := json.NewDecoder(r.Body).Decode(config); err != nil { if err := json.NewDecoder(r.Body).Decode(config); err != nil {
return err return err
} }
authConfig := srv.registry.GetAuthConfig(true)
if config.Username == srv.registry.GetAuthConfig().Username { if config.Username == authConfig.Username {
config.Password = srv.registry.GetAuthConfig().Password config.Password = authConfig.Password
} }
newAuthConfig := auth.NewAuthConfig(config.Username, config.Password, config.Email, srv.runtime.root) newAuthConfig := auth.NewAuthConfig(config.Username, config.Password, config.Email, srv.runtime.root)

2
docs/sources/installation/ubuntulinux.rst
View File

@ -38,7 +38,7 @@ Due to a bug in LXC docker works best on the 3.8 kernel. Precise comes with a 3.
.. code-block:: bash .. code-block:: bash
# install the backported kernel # install the backported kernel
sudo apt-get update && sudo apt-get install linux-image-3.8.0-19-generic sudo apt-get update && sudo apt-get install linux-image-generic-lts-raring
# reboot # reboot
sudo reboot sudo reboot

7
registry/registry.go
View File

@ -428,9 +428,14 @@ func (r *Registry) ResetClient(authConfig *auth.AuthConfig) {
r.client.Jar = cookiejar.NewCookieJar() r.client.Jar = cookiejar.NewCookieJar()
} }
func (r *Registry) GetAuthConfig() *auth.AuthConfig { func (r *Registry) GetAuthConfig(withPasswd bool) *auth.AuthConfig {
password := ""
if withPasswd {
password = r.authConfig.Password
}
return &auth.AuthConfig{ return &auth.AuthConfig{
Username: r.authConfig.Username, Username: r.authConfig.Username,
Password: password,
Email: r.authConfig.Email, Email: r.authConfig.Email,
} }
} }