summaryrefslogtreecommitdiff
path: root/api/server
diff options
context:
space:
mode:
authorAaron Lehmann <aaron.lehmann@docker.com>2016-02-12 09:08:45 -0800
committerAaron Lehmann <aaron.lehmann@docker.com>2016-02-12 10:50:16 -0800
commit6fed46aeb97943315aed12f2dc62565f7bcc53dc (patch)
tree6345f72eb3a5e1dcdb2f5a7b95d60c4bb7c93122 /api/server
parent2a16099f5792d360be5e08d05c5742190eec03e3 (diff)
downloaddocker-6fed46aeb97943315aed12f2dc62565f7bcc53dc.tar.gz
Pass authentication credentials through to build
In Docker 1.10 and earlier, "docker build" can do a build FROM a private repository that hasn't yet been pulled. This doesn't work on master. I bisected this to https://github.com/docker/docker/pull/19414. AuthConfigs is deserialized from the HTTP request, but not included in the builder options. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Diffstat (limited to 'api/server')
-rw-r--r--api/server/router/build/build_routes.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go
index 904a21664b..acc116b994 100644
--- a/api/server/router/build/build_routes.go
+++ b/api/server/router/build/build_routes.go
@@ -159,6 +159,8 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *
buildOptions.Dockerfile = dockerfileName
}
+ buildOptions.AuthConfigs = authConfigs
+
out = output
if buildOptions.SuppressOutput {
out = notVerboseBuffer