mirror of
https://github.com/containers/podman-compose.git
synced 2025-08-12 23:17:09 +02:00
Properly surface errors from push
command
Failure exit code for `push` command is not currently forwarded as exit code for podman-compose. With this PR, podman-compose stops pushing when the underlying podman command fails and forwards its exit code. Signed-off-by: Monika Kairaityte <monika@kibit.lt>
This commit is contained in:
@ -0,0 +1 @@
|
|||||||
|
Implemented forwarding failure exit code from `push` command.
|
@ -2799,14 +2799,18 @@ async def compose_pull(compose: PodmanCompose, args: argparse.Namespace) -> None
|
|||||||
|
|
||||||
|
|
||||||
@cmd_run(podman_compose, "push", "push stack images")
|
@cmd_run(podman_compose, "push", "push stack images")
|
||||||
async def compose_push(compose: PodmanCompose, args: argparse.Namespace) -> None:
|
async def compose_push(compose: PodmanCompose, args: argparse.Namespace) -> int | None:
|
||||||
services = set(args.services)
|
services = set(args.services)
|
||||||
|
status = 0
|
||||||
for cnt in compose.containers:
|
for cnt in compose.containers:
|
||||||
if "build" not in cnt:
|
if "build" not in cnt:
|
||||||
continue
|
continue
|
||||||
if services and cnt["_service"] not in services:
|
if services and cnt["_service"] not in services:
|
||||||
continue
|
continue
|
||||||
await compose.podman.run([], "push", [cnt["image"]])
|
s = await compose.podman.run([], "push", [cnt["image"]])
|
||||||
|
if s is not None and s != 0:
|
||||||
|
status = s
|
||||||
|
return status
|
||||||
|
|
||||||
|
|
||||||
def is_context_git_url(path: str) -> bool:
|
def is_context_git_url(path: str) -> bool:
|
||||||
|
@ -29,3 +29,25 @@ class TestComposeBuildFailMulti(unittest.TestCase, RunSubprocessMixin):
|
|||||||
)
|
)
|
||||||
self.assertIn("RUN false", str(output))
|
self.assertIn("RUN false", str(output))
|
||||||
self.assertIn("while running runtime: exit status 1", str(error))
|
self.assertIn("while running runtime: exit status 1", str(error))
|
||||||
|
|
||||||
|
def test_push_command_fail(self) -> None:
|
||||||
|
# test that push command is able to return other than "0" return code
|
||||||
|
# "push" command fails due to several steps missing before running it (logging, tagging)
|
||||||
|
try:
|
||||||
|
output, error = self.run_subprocess_assert_returncode(
|
||||||
|
[
|
||||||
|
podman_compose_path(),
|
||||||
|
"-f",
|
||||||
|
compose_yaml_path(),
|
||||||
|
"push",
|
||||||
|
"good",
|
||||||
|
],
|
||||||
|
expected_returncode=125,
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
self.run_subprocess_assert_returncode([
|
||||||
|
podman_compose_path(),
|
||||||
|
"-f",
|
||||||
|
compose_yaml_path(),
|
||||||
|
"down",
|
||||||
|
])
|
||||||
|
Reference in New Issue
Block a user