p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "rename configFile to auth in the job"

Browse Source 
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
This commit is contained in:
Victor Vieux
2014-05-07 22:58:09 +00:00
parent f9dae65842
commit f18c414a67
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/server/server.go
View File

@ -881,6 +881,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
// Both headers will be parsed and sent along to the daemon, but if a non-empty
// ConfigFile is present, any value provided as an AuthConfig directly will
// be overridden. See BuildFile::CmdFrom for details.
// /*
var (
authEncoded = r.Header.Get("X-Registry-Auth")
authConfig = &registry.AuthConfig{}
@ -895,6 +896,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
configFile.Configs[authConfig.ServerAddress] = *authConfig
}
}
// */
if configFileEncoded != "" {
configFileJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(configFileEncoded))
@ -917,7 +919,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
job.Setenv("q", r.FormValue("q"))
job.Setenv("nocache", r.FormValue("nocache"))
job.Setenv("rm", r.FormValue("rm"))
job.SetenvJson("auth", configFile)
job.SetenvJson("configFile", configFile)
if err := job.Run(); err != nil {
if !job.Stdout.Used() {

2
components/engine/server/buildfile.go
View File

@ -83,7 +83,7 @@ func (b *buildFile) CmdFrom(name string) error {
job := b.srv.Eng.Job("pull", remote, tag)
job.SetenvBool("json", b.sf.Json())
job.SetenvBool("parallel", true)
job.SetenvJson("auth", b.configFile)
job.SetenvJson("configFile", b.configFile)
job.Stdout.Add(b.outOld)
if err := job.Run(); err != nil {
return err

4
components/engine/server/server.go
View File

@ -432,7 +432,7 @@ func (srv *Server) Build(job *engine.Job) engine.Status {
tag string
context io.ReadCloser
)
job.GetenvJson("auth", configFile)
job.GetenvJson("configFile", configFile)
repoName, tag = utils.ParseRepositoryTag(repoName)
if remoteURL == "" {
@ -1349,7 +1349,7 @@ func (srv *Server) ImagePull(job *engine.Job) engine.Status {
tag = job.Args[1]
}
job.GetenvJson("auth", configFile)
job.GetenvJson("configFile", configFile)
job.GetenvJson("metaHeaders", metaHeaders)
endpoint, _, err := registry.ResolveRepositoryName(localName)