Merge pull request #180 from jacobtruman/XENG-8894

Pass docker container labels to daemon and ssh-agent container creation

Author: jacobtruman

buildrunner/__init__.py

@@ -399,7 +399,12 @@ def run(self):  # pylint: disable=too-many-statements,too-many-branches,too-many
                             multi_platform.set_cache_to(step_config.build.cache_to)
 
                         self._step_runner = BuildStepRunner(
-                            self, step_name, step_config, image_config, multi_platform
+                            self,
+                            step_name,
+                            step_config,
+                            image_config,
+                            multi_platform,
+                            self.buildrunner_config.container_labels,
                         )
                         self._step_runner.run()
 

buildrunner/docker/daemon.py

@@ -19,11 +19,12 @@ class DockerDaemonProxy:
     Class used to encapsulate Docker daemon information within a container.
     """
 
-    def __init__(self, docker_client, log, docker_registry):
+    def __init__(self, docker_client, log, docker_registry, container_labels):
         """ """
         self.docker_client = docker_client
         self.docker_registry = docker_registry
         self.log = log
+        self.container_labels = container_labels
         self._daemon_container = None
         self._env = {
             "DOCKER_HOST": DOCKER_DEFAULT_DOCKERD_URL,

buildrunner/sshagent/__init__.py

@@ -89,7 +89,12 @@ class DockerSSHAgentProxy:
     """
 
     def __init__(
-        self, docker_client, log, docker_registry, multiplatform_image_builder
+        self,
+        docker_client,
+        log,
+        docker_registry,
+        multiplatform_image_builder,
+        container_labels,
     ):
         """ """
         self.docker_client = docker_client
@@ -100,6 +105,7 @@ def __init__(
         self._ssh_client = None
         self._ssh_channel = None
         self._multiplatform_image_builder = multiplatform_image_builder
+        self._container_labels = container_labels
 
     def get_info(self):
         """
@@ -131,6 +137,7 @@ def start(self, keys):
             command=[
                 f"{keys[0].get_name()} {keys[0].get_base64()}",
             ],
+            labels=self._container_labels,
             host_config=self.docker_client.create_host_config(
                 publish_all_ports=True,
             ),

buildrunner/steprunner/__init__.py

@@ -53,6 +53,7 @@ def __init__(
         step: Step,
         image_config,
         multi_platform: MultiplatformImageBuilder,
+        container_labels,
     ):
         """
         Constructor.
@@ -78,6 +79,7 @@ def __init__(
         # generate a unique step id
         self.id = str(uuid.uuid4())  # pylint: disable=invalid-name
         self.multi_platform = multi_platform
+        self.container_labels = container_labels
 
     def run(self):
         """

buildrunner/steprunner/tasks/run.py

@@ -83,6 +83,7 @@ def _get_source_container(self):
             self._source_container = self._docker_client.create_container(
                 self.step_runner.build_runner.get_source_image(),
                 command="/bin/sh",
+                labels=self.step_runner.container_labels,
             )["Id"]
             self._docker_client.start(
                 self._source_container,
@@ -828,6 +829,7 @@ def run(self, context: dict):  # pylint: disable=too-many-statements,too-many-br
                 self.step_runner.log,
                 buildrunner_config.global_config.docker_registry,
                 self.step_runner.multi_platform,
+                self.step_runner.container_labels,
             )
             self._sshagent.start(
                 buildrunner_config.get_ssh_keys_from_aliases(
@@ -840,6 +842,7 @@ def run(self, context: dict):  # pylint: disable=too-many-statements,too-many-br
             self._docker_client,
             self.step_runner.log,
             buildrunner_config.global_config.docker_registry,
+            self.step_runner.container_labels,
         )
         self._dockerdaemonproxy.start()