Skip to content

Commit

Permalink
Cherry-pick commit cisagov@fb07833 into development branch for cisago…
Browse files Browse the repository at this point in the history
…v#226 to check /usr/bin/docker-compose, thanks @TheeNawMan
  • Loading branch information
mmguero committed Jan 10, 2023
1 parent 3903014 commit 2923d1d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions scripts/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2923d1d

Please sign in to comment.