Merge pull request #6314 from PeterSurda/docker-build-target

Add `target` parameter for docker build

master/buildbot/test/fake/docker.py

@@ -50,11 +50,13 @@ def stop(self, id):
     def wait(self, id):
         return 0
 
-    def build(self, fileobj, pull, tag):
+    def build(self, fileobj, tag, pull, target):
         if fileobj.read() == b'BUG':
             pass
         elif pull != bool(pull):
             pass
+        elif target != "":
+            pass
         else:
             logs = []
             for line in logs:

master/buildbot/worker/docker.py

@@ -166,7 +166,7 @@ def reconfigService(self, name, password, docker_host, image=None,
                         version=None, tls=None, followStartupLogs=False,
                         masterFQDN=None, hostconfig=None, autopull=False,
                         alwaysPull=False, custom_context=False,
-                        encoding='gzip', buildargs=None,
+                        encoding='gzip', target="", buildargs=None,
                         hostname=None, **kwargs):
 
         yield super().reconfigService(name, password, image, masterFQDN, **kwargs)
@@ -181,6 +181,7 @@ def reconfigService(self, name, password, docker_host, image=None,
         self.alwaysPull = alwaysPull
         self.custom_context = custom_context
         self.encoding = encoding
+        self.target = target
         self.buildargs = buildargs
         # Prepare the parameters for the Docker Client object (except docker_host which is
         # renderable and will be available only when starting containers).
@@ -217,18 +218,20 @@ def _getDockerClient(self, client_args):
     def renderWorkerProps(self, build):
         return build.render((self.docker_host, self.image, self.dockerfile,
                              self.volumes, self.hostconfig, self.custom_context,
-                             self.encoding, self.buildargs, self.hostname))
+                             self.encoding, self.target, self.buildargs,
+                             self.hostname))
 
     @defer.inlineCallbacks
     def start_instance(self, build):
         if self.instance is not None:
             raise ValueError('instance active')
-        docker_host, image, dockerfile, volumes, hostconfig, custom_context, encoding, buildargs, \
+        docker_host, image, dockerfile, volumes, hostconfig, custom_context, \
+            encoding, target, buildargs, \
             hostname = yield self.renderWorkerPropsOnStart(build)
 
         res = yield threads.deferToThread(self._thd_start_instance, docker_host, image,
                                           dockerfile, volumes, hostconfig, custom_context,
-                                          encoding, buildargs, hostname)
+                                          encoding, target, buildargs, hostname)
         return res
 
     def _image_exists(self, client, name):
@@ -242,7 +245,7 @@ def _image_exists(self, client, name):
         return False
 
     def _thd_start_instance(self, docker_host, image, dockerfile, volumes, host_config,
-                            custom_context, encoding, buildargs, hostname):
+                            custom_context, encoding, target, buildargs, hostname):
         curr_client_args = self.client_args.copy()
         curr_client_args['base_url'] = docker_host
 
@@ -274,12 +277,12 @@ def _thd_start_instance(self, docker_host, image, dockerfile, volumes, host_conf
                                                 custom_context=custom_context,
                                                 encoding=encoding, tag=image,
                                                 pull=self.alwaysPull,
+                                                target=target,
                                                 buildargs=buildargs)
             else:
                 lines = docker_client.build(
                     fileobj=BytesIO(dockerfile.encode('utf-8')),
-                    pull=self.alwaysPull,
-                    tag=image,
+                    tag=image, pull=self.alwaysPull, target=target,
                 )
 
             for line in lines:

master/docs/manual/configuration/workers-docker.rst

@@ -245,6 +245,10 @@ In addition to the arguments available for any :ref:`Latent-Workers`, :class:`Do
     Always pulls (update) image if autopull is set to true.
     Also affects the base image specified by `FROM ....` if using a dockerfile, autopull is not needed then.
 
+``target``
+    (renderable string, optional)
+    Sets target build stage for multi-stage builds when using a dockerfile.
+
 ``custom_context``
     (renderable boolean, optional)
 	Boolean indicating that the user wants to use custom build arguments for the docker environment. Defaults to False.

newsfragments/multi-stage-dockerfile.feature

@@ -0,0 +1 @@
+Added ``target`` support when using ``dockerfile`` parameter of ``DockerLatentWorker``.