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

Merge pull request #6195 from kieslee/master

Browse Source 
pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
Upstream-commit: 597c06ca34377c1a6b362fa622ba275cbea3d339
Component: engine
This commit is contained in:
unclejack
2014-06-05 00:23:08 +03:00
parent d0dbff4e5f a0957a5314
commit 0a81434b1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/server/server.go
+2 -2
View File
@@ -1381,7 +1381,7 @@ func (srv *Server) ImagePull(job *engine.Job) engine.Status {
}
job.GetenvJson("authConfig", authConfig)
job.GetenvJson("metaHeaders", metaHeaders)
job.GetenvJson("metaHeaders", &metaHeaders)
c, err := srv.poolAdd("pull", localName+":"+tag)
if err != nil {
@@ -1611,7 +1611,7 @@ func (srv *Server) ImagePush(job *engine.Job) engine.Status {
tag := job.Getenv("tag")
job.GetenvJson("authConfig", authConfig)
job.GetenvJson("metaHeaders", metaHeaders)
job.GetenvJson("metaHeaders", &metaHeaders)
if _, err := srv.poolAdd("push", localName); err != nil {
return job.Error(err)
}