From af41baae227df37b81a0f97dbd9ec6cf8f269bf1 Mon Sep 17 00:00:00 2001 From: Shane Brown Date: Wed, 9 Aug 2023 12:22:43 -0600 Subject: [PATCH] Fix Dockerfile arg and formatted strings --- buildrunner/docker/multiplatform_image_builder.py | 4 ++-- buildrunner/steprunner/tasks/build.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildrunner/docker/multiplatform_image_builder.py b/buildrunner/docker/multiplatform_image_builder.py index f349c899..ad175d4b 100644 --- a/buildrunner/docker/multiplatform_image_builder.py +++ b/buildrunner/docker/multiplatform_image_builder.py @@ -207,7 +207,7 @@ def _build_single_image(self, assert os.path.isdir(path) and os.path.exists(f"{file}"), \ f"Either path {path}({os.path.isdir(path)}) or file " \ - "'{file}'({os.path.exists(f'{file}')}) does not exist!" + f"'{file}'({os.path.exists(f'{file}')}) does not exist!" tagged_names = [f"{name}:{tag}" for tag in tags] LOGGER.debug(f"Building {tagged_names} for {platform}") @@ -335,7 +335,7 @@ def push(self, name: str, dest_names: List[str] = None) -> None: curr_process.kill() if retries == 0: raise TimeoutError(f"Timeout pushing {dest_names} after {retries} retries" - " and {timeout_seconds} seconds each try") + f" and {timeout_seconds} seconds each try") else: # Process finished within timeout LOGGER.info(f"Successfully created multiplatform images {dest_names}") diff --git a/buildrunner/steprunner/tasks/build.py b/buildrunner/steprunner/tasks/build.py index 77fe10d3..f32233b7 100644 --- a/buildrunner/steprunner/tasks/build.py +++ b/buildrunner/steprunner/tasks/build.py @@ -214,7 +214,7 @@ def run(self, context): built_images = self.step_runner.multi_platform.build_multiple_images( platforms=self.platform, path=self.path, - file=self.config.get('dockerfile'), + file=self.dockerfile, name=self.get_unique_build_name(), )