From 2923d1d092c7b70fe913ee451dae71b4bebd00d9 Mon Sep 17 00:00:00 2001 From: Seth Grover Date: Tue, 10 Jan 2023 14:10:40 -0700 Subject: [PATCH] Cherry-pick commit https://github.com/cisagov/Malcolm/pull/226/commits/fb0783318b944e477a5a860b98fcf336be03e5a9 into development branch for cisagov/Malcolm#226 to check /usr/bin/docker-compose, thanks @TheeNawMan --- scripts/control.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/control.py b/scripts/control.py index be7816d51..14fa6dbe9 100755 --- a/scripts/control.py +++ b/scripts/control.py @@ -1516,6 +1516,8 @@ def main(): dockerComposeBin = '/usr/local/opt/docker-compose/bin/docker-compose' elif os.path.isfile('/usr/local/bin/docker-compose'): dockerComposeBin = '/usr/local/bin/docker-compose' + elif os.path.isfile('/usr/bin/docker-compose'): + dockerComposeBin = '/usr/bin/docker-compose' else: dockerComposeBin = 'docker-compose' err, out = run_process([dockerBin, 'info'], debug=args.debug)