Use legacy builder for run step post-build

Author: shanejbrown

buildrunner/steprunner/tasks/build.py

@@ -37,13 +37,15 @@ def __init__(
         step_runner,
         step: StepBuild,
         image_to_prepend_to_dockerfile=None,
+        force_legacy_builder=False,
     ):  # pylint: disable=too-many-statements,too-many-branches,too-many-locals
         super().__init__(step_runner, step)
         self._docker_client = buildrunner.docker.new_client(
             timeout=step_runner.build_runner.docker_timeout,
         )
         self.to_inject = {}
         self.image_to_prepend_to_dockerfile = image_to_prepend_to_dockerfile
+        self.force_legacy_builder = force_legacy_builder
 
         self._import = step.import_param
         self.path = step.path
@@ -211,7 +213,9 @@ def run(self, context):
         self.step_runner.log.write("Running docker build\n")
 
         try:
-            if self.platforms or not buildrunner_config.run_config.use_legacy_builder:
+            if (
+                self.platforms or not buildrunner_config.run_config.use_legacy_builder
+            ) and not self.force_legacy_builder:
                 if self.platforms and buildrunner_config.run_config.use_legacy_builder:
                     LOGGER.warning(
                         f"Ignoring use-legacy-builder. Using the legacy builder for multiplatform images {self.platforms} is not supported. "

buildrunner/steprunner/tasks/run.py

@@ -1160,7 +1160,10 @@ def _run_post_build(self, context):
 
         post_build.pull = False
         build_image_task = BuildBuildStepRunnerTask(
-            self.step_runner, post_build, image_to_prepend_to_dockerfile=temp_tag
+            self.step_runner,
+            post_build,
+            image_to_prepend_to_dockerfile=temp_tag,
+            force_legacy_builder=True,
         )
         _build_context = {}
         build_image_task.run(_build_context)