Pass authentication credentials through to build

Aaron Lehmann · Aaron Lehmann · commit 6fed46aeb979 · 2016-02-12T10:50:16.000-08:00
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 moby#19414. AuthConfigs is deserialized from the HTTP request, but not included in the builder options. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
diff --git 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
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
@@ -6534,3 +6534,26 @@ func (s *DockerSuite) TestBuildWorkdirWindowsPath(c *check.C) {
 		c.Fatal(err)
 	}
 }
+
+func (s *DockerRegistryAuthSuite) TestBuildFromAuthenticatedRegistry(c *check.C) {
+	dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, "-e", s.reg.email, privateRegistryURL)
+
+	baseImage := privateRegistryURL + "/baseimage"
+
+	_, err := buildImage(baseImage, `
+	FROM busybox
+	ENV env1 val1
+	`, true)
+
+	c.Assert(err, checker.IsNil)
+
+	dockerCmd(c, "push", baseImage)
+	dockerCmd(c, "rmi", baseImage)
+
+	_, err = buildImage(baseImage, fmt.Sprintf(`
+	FROM %s
+	ENV env2 val2
+	`, baseImage), true)
+
+	c.Assert(err, checker.IsNil)
+}

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@ func (br buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r `
`159`	`159`	`buildOptions.Dockerfile = dockerfileName`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ buildOptions.AuthConfigs = authConfigs`
	`163`	`+`
`162`	`164`	`out = output`
`163`	`165`	`if buildOptions.SuppressOutput {`
`164`	`166`	`out = notVerboseBuffer`