Merge branch 'master' of github.com:Budibase/budibase into fix/user-column-search-mapping
This commit is contained in:
commit
cfe261a8f6
|
@ -57,7 +57,8 @@ export async function checkDockerConfigured() {
|
||||||
"docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose"
|
"docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose"
|
||||||
const docker = await lookpath("docker")
|
const docker = await lookpath("docker")
|
||||||
const compose = await lookpath("docker-compose")
|
const compose = await lookpath("docker-compose")
|
||||||
if (!docker || !compose) {
|
const composeV2 = await lookpath("docker compose")
|
||||||
|
if (!docker || (!compose && !composeV2)) {
|
||||||
throw error
|
throw error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue