From dd6847c8b5a1d63902d343c772f62c8be060e1bf Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 4 Nov 2024 16:01:12 +0000
Subject: [PATCH 1/2] Bump version to 3.0.2

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

diff --git a/lerna.json b/lerna.json
index e4b72979b9..77ca852955 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

From 6e2008c817d9b450f34712d838612686f2a9212b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 4 Nov 2024 16:05:51 +0000
Subject: [PATCH 2/2] Add USE_DEFAULT_REDIS_CONFIG environment variable to
 single image to disable our config customisations.

---
 hosting/single/runner.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index d9b8719f0f..e06a197ad5 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -81,11 +81,17 @@ mkdir -p ${DATA_DIR}/minio
 mkdir -p ${DATA_DIR}/redis
 chown -R couchdb:couchdb ${DATA_DIR}/couch
 
-sed -i "s#DATA_DIR#${DATA_DIR}#g" /etc/redis/redis.conf
+REDIS_CONFIG="/etc/redis/redis.conf"
+sed -i "s#DATA_DIR#${DATA_DIR}#g" "${REDIS_CONFIG}"
+
+if [[ -n "${USE_DEFAULT_REDIS_CONFIG}" ]]; then
+  REDIS_CONFIG=""
+fi
+
 if [[ -n "${REDIS_PASSWORD}" ]]; then
-  redis-server /etc/redis/redis.conf --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
+  redis-server "${REDIS_CONFIG}" --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
 else
-  redis-server /etc/redis/redis.conf > /dev/stdout 2>&1 &
+  redis-server "${REDIS_CONFIG}" > /dev/stdout 2>&1 &
 fi
 /bbcouch-runner.sh &