MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support

This commit is contained in:
Michael Drury 2023-10-06 12:18:20 +01:00 committed by GitHub
parent 58a22ccde8 a19c5aed19
commit 8f41554c6f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/deploy-featurebranch.yml vendored
View File

@ -4,6 +4,7 @@ on:
pull_request: pull_request:
branches: branches:
- develop - develop
- master
jobs: jobs:
release: release:

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.11.10", "version": "2.11.12",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

3
packages/cli/src/hosting/utils.ts
View File

@ -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
} }
} }