From 0bc92fd787d1322f9ae16c2103747db90befa1f5 Mon Sep 17 00:00:00 2001 From: Ben Krieger Date: Sun, 12 Jan 2025 22:49:46 -0500 Subject: [PATCH] Fix CMD healthchecks running with /bin/sh Signed-off-by: Ben Krieger --- podman_compose.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/podman_compose.py b/podman_compose.py index faae0a6..bc5bff5 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -28,14 +28,8 @@ import sys from asyncio import Task from enum import Enum -try: - from shlex import quote as cmd_quote -except ImportError: - from pipes import quote as cmd_quote # pylint: disable=deprecated-module - # import fnmatch # fnmatch.fnmatchcase(env, "*_HOST") - import yaml from dotenv import dotenv_values @@ -1193,7 +1187,7 @@ async def container_to_args(compose, cnt, detached=True): # podman does not add shell to handle command with whitespace podman_args.extend([ "--healthcheck-command", - "/bin/sh -c " + cmd_quote(healthcheck_test), + json.dumps(["CMD-SHELL", healthcheck_test]), ]) elif is_list(healthcheck_test): healthcheck_test = healthcheck_test.copy() @@ -1202,13 +1196,11 @@ async def container_to_args(compose, cnt, detached=True): if healthcheck_type == "NONE": podman_args.append("--no-healthcheck") elif healthcheck_type == "CMD": - cmd_q = "' '".join([cmd_quote(i) for i in healthcheck_test]) - podman_args.extend(["--healthcheck-command", "/bin/sh -c " + cmd_q]) + podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)]) elif healthcheck_type == "CMD-SHELL": if len(healthcheck_test) != 1: raise ValueError("'CMD_SHELL' takes a single string after it") - cmd_q = cmd_quote(healthcheck_test[0]) - podman_args.extend(["--healthcheck-command", "/bin/sh -c " + cmd_q]) + podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)]) else: raise ValueError( f"unknown healthcheck test type [{healthcheck_type}],\