Fix inject errors

Author: shanejbrown

buildrunner/docker/multiplatform_image_builder.py

@@ -199,15 +199,12 @@ def _build_with_inject(
         inject: dict,
         image_ref: str,
         platform: str,
-        context_path: str,
         dockerfile: str,
-        target: str,
         build_args: dict,
-        builder: Optional[str],
-        cache: bool = False,
-        pull: bool = False,
-        secrets: Optional[List[str]] = None,
+        build_kwargs: dict,
     ) -> None:
+        context_path = build_kwargs.get("context_path")
+
         if not context_path or not os.path.isdir(context_path):
             LOGGER.warning(
                 f"Failed to inject {inject} for {image_ref} since path {context_path} isn't a directory."
@@ -258,18 +255,13 @@ def _build_with_inject(
             ), f"Failed to create context dir {context_dir}"
 
             logs_itr = docker.buildx.build(
-                context_dir,
-                tags=[image_ref],
-                platforms=[platform],
-                load=True,
-                target=target,
-                builder=builder,
                 build_args=build_args,
-                cache=cache,
-                pull=pull,
+                load=True,
+                platforms=[platform],
                 stream_logs=True,
-                secrets=secrets,
-                **self._get_build_cache_options(builder),
+                tags=[image_ref],
+                **build_kwargs,
+                **self._get_build_cache_options(build_kwargs.get("builder")),
             )
             self._log_buildx(logs_itr, platform)
 
@@ -328,17 +320,19 @@ def _build_single_image(
         )
 
         # Build kwargs for the buildx build command
-        build_kwargs = {
-            "builder": builder,
-            "cache": cache,
-            "context_path": path,
-            "pull": pull,
-            "target": target,
-        }
-
-        # Only pass secrets if they are provided
+        build_kwargs = {}
+        if builder:
+            build_kwargs["builder"] = builder
+        if cache:
+            build_kwargs["cache"] = cache
+        if path:
+            build_kwargs["context_path"] = path
+        if pull:
+            build_kwargs["pull"] = pull
         if secrets:
             build_kwargs["secrets"] = secrets
+        if target:
+            build_kwargs["target"] = target
 
         if inject and isinstance(inject, dict):
             self._build_with_inject(
@@ -347,7 +341,7 @@ def _build_single_image(
                 platform=platform,
                 dockerfile=dockerfile,
                 build_args=build_args,
-                **build_kwargs,
+                build_kwargs=build_kwargs,
             )
         else:
             logs_itr = docker.buildx.build(