From 40fd056237099f53d627d955e2d0090ed3f4885b Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 23 Nov 2023 11:40:21 +0000
Subject: [PATCH] Make Clouseau work in both single image and Helm deployments.

---
 hosting/couchdb/Dockerfile            |  3 +-
 hosting/couchdb/build-target-paths.sh | 32 ---------------------
 hosting/couchdb/clouseau/clouseau.ini |  3 ++
 hosting/couchdb/couch/vm.args         |  5 ++--
 hosting/couchdb/runner.sh             | 41 +++++++++++++++++++++++++--
 hosting/single/Dockerfile             |  1 -
 hosting/single/Dockerfile.v2          |  2 +-
 7 files changed, 47 insertions(+), 40 deletions(-)
 delete mode 100644 hosting/couchdb/build-target-paths.sh

diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile
index 792856cac7..f83df7038b 100644
--- a/hosting/couchdb/Dockerfile
+++ b/hosting/couchdb/Dockerfile
@@ -29,7 +29,6 @@ WORKDIR /opt/couchdb
 ADD couch/vm.args couch/local.ini ./etc/
 
 WORKDIR /
-ADD build-target-paths.sh .
 ADD runner.sh ./bbcouch-runner.sh
-RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau ./build-target-paths.sh
+RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau
 CMD ["./bbcouch-runner.sh"]
diff --git a/hosting/couchdb/build-target-paths.sh b/hosting/couchdb/build-target-paths.sh
deleted file mode 100644
index 90d9130cd4..0000000000
--- a/hosting/couchdb/build-target-paths.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-echo ${TARGETBUILD} > /buildtarget.txt
-if [[ "${TARGETBUILD}" = "aas" ]]; then
-    # Azure AppService uses /home for persistent data & SSH on port 2222
-    DATA_DIR="${DATA_DIR:-/home}"
-    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
-    mkdir -p $DATA_DIR/{search,minio,couch}
-    mkdir -p $DATA_DIR/couch/{dbs,views}
-    chown -R couchdb:couchdb $DATA_DIR/couch/
-    apt update
-    apt-get install -y openssh-server
-    echo "root:Docker!" | chpasswd
-    mkdir -p /tmp
-    chmod +x /tmp/ssh_setup.sh \
-        && (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
-    cp /etc/sshd_config /etc/ssh/sshd_config
-    /etc/init.d/ssh restart
-    sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
-elif [[ "${TARGETBUILD}" = "single" ]]; then
-    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
-elif [[ -n $KUBERNETES_SERVICE_HOST ]]; then
-    # In Kubernetes the directory /opt/couchdb/data has a persistent volume
-    # mount for storing database data.
-    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/couchdb/etc/local.ini
-else
-    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
-fi
\ No newline at end of file
diff --git a/hosting/couchdb/clouseau/clouseau.ini b/hosting/couchdb/clouseau/clouseau.ini
index 9e03f8bc6e..578a5acafa 100644
--- a/hosting/couchdb/clouseau/clouseau.ini
+++ b/hosting/couchdb/clouseau/clouseau.ini
@@ -1,5 +1,8 @@
 [clouseau]
 
+; the name of the Erlang node created by the service, leave this unchanged
+name=clouseau@127.0.0.1
+
 ; set this to the same distributed Erlang cookie used by the CouchDB nodes
 cookie=monster
 
diff --git a/hosting/couchdb/couch/vm.args b/hosting/couchdb/couch/vm.args
index 33873b91a7..ea2b4d26ae 100644
--- a/hosting/couchdb/couch/vm.args
+++ b/hosting/couchdb/couch/vm.args
@@ -11,6 +11,7 @@
 # the License.
 
 # erlang cookie for clouseau security
+-name couchdb@127.0.0.1
 -setcookie monster
 
 # Ensure that the Erlang VM listens on a known port
@@ -18,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/couchdb/runner.sh b/hosting/couchdb/runner.sh
index 32951cb539..2e4d26122f 100644
--- a/hosting/couchdb/runner.sh
+++ b/hosting/couchdb/runner.sh
@@ -6,10 +6,47 @@ mkdir -p ${DATA_DIR}
 mkdir -p ${DATA_DIR}/couch/{dbs,views}
 mkdir -p ${DATA_DIR}/search
 chown -R couchdb:couchdb ${DATA_DIR}/couch
-/build-target-paths.sh
+
+echo ${TARGETBUILD} > /buildtarget.txt
+if [[ "${TARGETBUILD}" = "aas" ]]; then
+    # Azure AppService uses /home for persistent data & SSH on port 2222
+    DATA_DIR="${DATA_DIR:-/home}"
+    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
+    mkdir -p $DATA_DIR/{search,minio,couch}
+    mkdir -p $DATA_DIR/couch/{dbs,views}
+    chown -R couchdb:couchdb $DATA_DIR/couch/
+    apt update
+    apt-get install -y openssh-server
+    echo "root:Docker!" | chpasswd
+    mkdir -p /tmp
+    chmod +x /tmp/ssh_setup.sh \
+        && (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
+    cp /etc/sshd_config /etc/ssh/sshd_config
+    /etc/init.d/ssh restart
+    sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
+elif [[ "${TARGETBUILD}" = "single" ]]; then
+    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
+elif [[ -n $KUBERNETES_SERVICE_HOST ]]; then
+    # In Kubernetes the directory /opt/couchdb/data has a persistent volume
+    # mount for storing database data.
+    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/couchdb/etc/local.ini
+    sed -i "s/^-name .*$//g" /opt/couchdb/etc/vm.args
+else
+    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
+fi
+
 /opt/clouseau/bin/clouseau > /dev/stdout 2>&1 &
 /docker-entrypoint.sh /opt/couchdb/bin/couchdb &
-sleep 10
+
+while [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; do
+    echo 'Waiting for CouchDB to start...';
+    sleep 5;
+done
+
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_users
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_replicator
 sleep infinity
\ No newline at end of file
diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index c7b90dbdc4..84c3b824fb 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -81,7 +81,6 @@ RUN chmod +x ./healthcheck.sh
 # For Azure App Service install SSH & point data locations to /home
 ADD hosting/single/ssh/sshd_config /etc/
 ADD hosting/single/ssh/ssh_setup.sh /tmp
-RUN /build-target-paths.sh
 
 # cleanup cache
 RUN yarn cache clean -f
diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2
index dd61c779b5..afbb377a4b 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 budibase/couchdb as runner
+FROM samwho/test as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 ENV NODE_MAJOR 18