extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-05-31 23:45:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix CMD healthchecks running with /bin/sh

Browse Source 
Signed-off-by: Ben Krieger <ben.krieger@intel.com>
This commit is contained in:
Ben Krieger 2025-01-12 22:49:46 -05:00 committed by Monika Kairaityte
parent f5e3162e91
commit 76b3055934
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newsfragments/fix-cmd-healtchecks.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed support for CMD healthchecks to run using the given command directly and not using `/bin/sh -c`.

14
podman_compose.py
View File

@ -29,14 +29,8 @@ import urllib.parse
from asyncio import Task from asyncio import Task
from enum import Enum 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 # import fnmatch
# fnmatch.fnmatchcase(env, "*_HOST") # fnmatch.fnmatchcase(env, "*_HOST")
import yaml import yaml
from dotenv import dotenv_values from dotenv import dotenv_values
@ -1228,7 +1222,7 @@ async def container_to_args(compose, cnt, detached=True, no_deps=False):
# podman does not add shell to handle command with whitespace # podman does not add shell to handle command with whitespace
podman_args.extend([ podman_args.extend([
"--healthcheck-command", "--healthcheck-command",
"/bin/sh -c " + cmd_quote(healthcheck_test), json.dumps(["CMD-SHELL", healthcheck_test]),
]) ])
elif is_list(healthcheck_test): elif is_list(healthcheck_test):
healthcheck_test = healthcheck_test.copy() healthcheck_test = healthcheck_test.copy()
@ -1237,13 +1231,11 @@ async def container_to_args(compose, cnt, detached=True, no_deps=False):
if healthcheck_type == "NONE": if healthcheck_type == "NONE":
podman_args.append("--no-healthcheck") podman_args.append("--no-healthcheck")
elif healthcheck_type == "CMD": elif healthcheck_type == "CMD":
cmd_q = "' '".join([cmd_quote(i) for i in healthcheck_test]) podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)])
podman_args.extend(["--healthcheck-command", "/bin/sh -c " + cmd_q])
elif healthcheck_type == "CMD-SHELL": elif healthcheck_type == "CMD-SHELL":
if len(healthcheck_test) != 1: if len(healthcheck_test) != 1:
raise ValueError("'CMD_SHELL' takes a single string after it") raise ValueError("'CMD_SHELL' takes a single string after it")
cmd_q = cmd_quote(healthcheck_test[0]) podman_args.extend(["--healthcheck-command", json.dumps(healthcheck_test)])
podman_args.extend(["--healthcheck-command", "/bin/sh -c " + cmd_q])
else: else:
raise ValueError( raise ValueError(
f"unknown healthcheck test type [{healthcheck_type}],\ f"unknown healthcheck test type [{healthcheck_type}],\