mirror of
https://github.com/fauxpilot/fauxpilot.git
synced 2025-08-20 13:24:27 -07:00
Resole merge conflicts
This commit is contained in:
commit
de71bb6ff5
6 changed files with 53 additions and 35 deletions
|
@ -8,9 +8,8 @@ fi
|
|||
source .env
|
||||
|
||||
# On newer versions, docker-compose is docker compose
|
||||
DOCKER_COMPOSE=$(command -v docker-compose)
|
||||
if [ -z "$DOCKER_COMPOSE" ]; then
|
||||
DOCKER_COMPOSE="docker compose"
|
||||
if command -v docker-compose > /dev/null; then
|
||||
docker compose up
|
||||
else
|
||||
docker-compose up
|
||||
fi
|
||||
|
||||
$DOCKER_COMPOSE up
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue