From 5810529350f6037fcd8bf5f9a84795ce91df9eae Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 5 Oct 2023 23:03:34 +0100
Subject: [PATCH 1/4] Quick fix for #11982 - check for both deprecated
 docker-compose and docker compose V2.

---
 packages/cli/src/hosting/utils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts
index 93e31b8aea..a4b28539e9 100644
--- a/packages/cli/src/hosting/utils.ts
+++ b/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
   }
 }

From 45b0251a1429a94585b597f85766c257bae9bdb3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Fri, 6 Oct 2023 12:02:17 +0100
Subject: [PATCH 2/4] Update deploy-featurebranch.yml

---
 .github/workflows/deploy-featurebranch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index f06707ab2b..f843e222b0 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - develop
+      - master
 
 jobs:
   release:

From 78bba266039830bbfbc472aaf54891678f3cad32 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 11:02:37 +0000
Subject: [PATCH 3/4] Bump version to 2.11.11

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index aa2399aaab..2e41284df3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.10",
+  "version": "2.11.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From a19c5aed19db2455192d17fd893db9741faaa7e4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 6 Oct 2023 11:17:04 +0000
Subject: [PATCH 4/4] Bump version to 2.11.12

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 2e41284df3..6270454faa 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.11",
+  "version": "2.11.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"