From c50770da0a31e1104844cb2d7bf0b9e6a80656bf Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 23 Nov 2023 17:06:52 +0000
Subject: [PATCH] Tidy up the chart.

---
 charts/budibase/values.yaml   | 8 +++++---
 hosting/couchdb/couch/vm.args | 4 ++--
 hosting/single/Dockerfile.v2  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 9409363bbb..5df6e980f0 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -262,7 +262,7 @@ services:
 # Override values in couchDB subchart
 couchdb:
   # -- the initial number of nodes in the CouchDB cluster.
-  clusterSize: 3
+  clusterSize: 1
 
   # -- If allowAdminParty is enabled the cluster will start up without any database
   # administrator account; i.e., all users will be granted administrative
@@ -329,7 +329,9 @@ couchdb:
     tag: v3.2.1
     pullPolicy: IfNotPresent
 
-  # -- Flip this to flag to include the Search container in each Pod
+  # This should remain false. We ship Clouseau ourselves as part of the
+  # budibase/couchdb image, and it's not possible to disable it because it's a
+  # core part of the Budibase experience.
   enableSearch: false
 
   initImage:
@@ -448,7 +450,7 @@ couchdb:
   # ref: http://docs.couchdb.org/en/latest/config/index.html
   couchdbConfig:
     couchdb:
-      uuid: decafbaddecafbaddecafbaddecafbad # Unique identifier for this CouchDB server instance
+      uuid: budibase-couchdb # Unique identifier for this CouchDB server instance
     # cluster:
     #   q: 8 # Create 8 shards for each database
     chttpd:
diff --git a/hosting/couchdb/couch/vm.args b/hosting/couchdb/couch/vm.args
index ea2b4d26ae..e9e4416863 100644
--- a/hosting/couchdb/couch/vm.args
+++ b/hosting/couchdb/couch/vm.args
@@ -19,8 +19,8 @@
 -kernel inet_dist_listen_max 9100
 
 # Tell kernel and SASL not to log anything
-# -kernel error_logger silent
-# -sasl sasl_error_logger false
+-kernel error_logger silent
+-sasl sasl_error_logger false
 
 # Use kernel poll functionality if supported by emulator
 +K true
diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2
index afbb377a4b..dd61c779b5 100644
--- a/hosting/single/Dockerfile.v2
+++ b/hosting/single/Dockerfile.v2
@@ -39,7 +39,7 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 COPY packages/string-templates packages/string-templates
 
 
-FROM samwho/test as runner
+FROM budibase/couchdb as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 ENV NODE_MAJOR 18