extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-05-29 06:37:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extract container_to_build_args()

Browse Source 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
This commit is contained in:
Povilas Kanapickas 2024-12-30 00:52:45 +02:00
parent 61fa24bf21
commit 9964604b17
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
podman_compose.py
View File

@ -2429,18 +2429,7 @@ async def compose_push(compose, args):
await compose.podman.run([], "push", [cnt["image"]]) await compose.podman.run([], "push", [cnt["image"]])
async def build_one(compose, args, cnt): def container_to_build_args(compose, cnt, args, path_exists):
if "build" not in cnt:
return None
if getattr(args, "if_not_exists", None):
try:
img_id = await compose.podman.output(
[], "inspect", ["-t", "image", "-f", "{{.Id}}", cnt["image"]]
)
except subprocess.CalledProcessError:
img_id = None
if img_id:
return None
build_desc = cnt["build"] build_desc = cnt["build"]
if not hasattr(build_desc, "items"): if not hasattr(build_desc, "items"):
build_desc = {"context": build_desc} build_desc = {"context": build_desc}
@ -2459,9 +2448,9 @@ async def build_one(compose, args, cnt):
] ]
for dockerfile in dockerfile_alts: for dockerfile in dockerfile_alts:
dockerfile = os.path.join(ctx, dockerfile) dockerfile = os.path.join(ctx, dockerfile)
if os.path.exists(dockerfile): if path_exists(dockerfile):
break break
if not os.path.exists(dockerfile): if not path_exists(dockerfile):
raise OSError("Dockerfile not found in " + ctx) raise OSError("Dockerfile not found in " + ctx)
build_args = ["-f", dockerfile, "-t", cnt["image"]] build_args = ["-f", dockerfile, "-t", cnt["image"]]
if "platform" in cnt: if "platform" in cnt:
@ -2495,6 +2484,23 @@ async def build_one(compose, args, cnt):
build_arg, build_arg,
)) ))
build_args.append(ctx) build_args.append(ctx)
return build_args
async def build_one(compose, args, cnt):
if "build" not in cnt:
return None
if getattr(args, "if_not_exists", None):
try:
img_id = await compose.podman.output(
[], "inspect", ["-t", "image", "-f", "{{.Id}}", cnt["image"]]
)
except subprocess.CalledProcessError:
img_id = None
if img_id:
return None
build_args = container_to_build_args(compose, cnt, args, os.path.exists)
status = await compose.podman.run([], "build", build_args) status = await compose.podman.run([], "build", build_args)
return status return status