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

.github/workflows/deploy-featurebranch.yml

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

lerna.json

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

packages/cli/src/hosting/utils.ts

@@ -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"
   const docker = await lookpath("docker")
   const compose = await lookpath("docker-compose")
-  if (!docker || !compose) {
+  const composeV2 = await lookpath("docker compose")
+  if (!docker || (!compose && !composeV2)) {
     throw error
   }
 }