Skip to content
Open
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
8 changes: 6 additions & 2 deletions podman_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -3016,11 +3016,15 @@ def container_to_build_args(
path_exists: Callable[[str], bool],
cleanup_callbacks: list[Callable] | None = None,
) -> list[str]:
build_args = []
build_desc = cnt["build"]
if not hasattr(build_desc, "items"):
build_desc = {"context": build_desc}
ctx = build_desc.get("context", ".")
dockerfile = build_desc.get("dockerfile", "")
if dockerfile is not None:
dockerfile = os.path.join(ctx, dockerfile)
build_args.extend(["-f", dockerfile])
dockerfile_inline = build_desc.get("dockerfile_inline")
if dockerfile_inline is not None:
dockerfile_inline = str(dockerfile_inline)
Expand All @@ -3031,15 +3035,15 @@ def container_to_build_args(
dockerfile.write(dockerfile_inline.encode())
dockerfile.close()
dockerfile = dockerfile.name

build_args.extend(["-f", dockerfile])

def cleanup_temp_dockfile() -> None:
if os.path.exists(dockerfile):
os.remove(dockerfile)

if cleanup_callbacks is not None:
cleanup_callbacks.append(cleanup_temp_dockfile)

build_args = []
# if givent context was not recognized as git url, try joining paths to get a file locally
if not is_context_git_url(ctx):
custom_dockerfile_given = False
Expand Down
Loading