Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/kapla/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.34.0"
__version__ = "0.35.0"
7 changes: 6 additions & 1 deletion src/kapla/projects/kproject.py
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,8 @@ def _create_docker_command(
**kwargs: Any,
) -> Command:
cmd = Command("docker buildx build", deadline=deadline, quiet=quiet, **kwargs)
build_args = self._prepare_build_args(spec, git_infos, build_args, tag)
build_args = self._prepare_build_args(spec, image, git_infos, build_args, tag)
# add specific build arg for this image to build
logger.warning("Using build args", build_args=build_args)
for key, value in build_args.items():
cmd.add_option("--build-arg", "=".join([key, value]), escape=True)
Expand Down Expand Up @@ -950,6 +951,7 @@ def _create_docker_command(
def _prepare_build_args(
self,
spec: DockerSpec,
image: DockerImageSpec,
git_infos: GitInfos,
build_args: Optional[Dict[str, str]],
tag: str,
Expand All @@ -958,6 +960,9 @@ def _prepare_build_args(
if build_args:
_build_args.update(build_args)
build_args = _build_args.copy()
# add specific build args for this image
if image.build_args is not None:
build_args.update(image.build_args)
if spec.base_image and "BASE_IMAGE" not in build_args:
base_image = (
spec.base_image + ":" + tag
Expand Down
1 change: 1 addition & 0 deletions src/kapla/specs/kproject.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
class DockerImageSpec(AliasedModel):
name: str
template: Optional[str] = None
build_args: Optional[Dict[str, str]] = None # specific build_arg for this image


class DockerSpec(AliasedModel):
Expand Down
Loading