From 28553fc684c89871d5e8aec64df9a551ddf0ca38 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 03:02:34 +0200
Subject: [PATCH 01/10] formatting and add special minio version

---
 hosting/single/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index e4858d4af0..043cd3dd73 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASEIMG=budibase/couchdb:v3.3.3-sqs-v2.1.1
-FROM node:20-slim as build
+FROM node:20-slim AS build
 
 # install node-gyp dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends g++ make python3 jq
@@ -34,7 +34,7 @@ COPY packages/worker/dist packages/worker/dist
 COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 
 
-FROM $BASEIMG as runner
+FROM $BASEIMG AS runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)
@@ -67,6 +67,11 @@ RUN mkdir -p /var/log/nginx && \
 
 # setup minio
 WORKDIR /minio
+
+# a 2022 version of minio that supports gateway mode
+COPY scripts/resources/minio /minio
+
+# handles the installation of minio in non-aas environments
 COPY scripts/install-minio.sh ./install.sh
 RUN chmod +x install.sh && ./install.sh
 

From d4a2b6d0610fd27272f8d93ca65b68fc0e20a362 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 03:02:42 +0200
Subject: [PATCH 02/10] handle minio with gateway

---
 hosting/single/runner.sh | 47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index e06a197ad5..d6b77e9e42 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -19,14 +19,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 [[ -z "${SERVER_TOP_LEVEL_PATH}" ]] && export SERVER_TOP_LEVEL_PATH=/app
 #  export CUSTOM_DOMAIN=budi001.custom.com
 
-# Azure App Service customisations
-if [[ "${TARGETBUILD}" = "aas" ]]; then
-    export DATA_DIR="${DATA_DIR:-/home}"
-    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
-    /etc/init.d/ssh start
-else
-    export DATA_DIR=${DATA_DIR:-/data}
-fi
+export DATA_DIR=${DATA_DIR:-/data}
 mkdir -p ${DATA_DIR}
 # Mount NFS or GCP Filestore if env vars exist for it
 if [[ ! -z ${FILESHARE_IP} && ! -z ${FILESHARE_NAME} ]]; then
@@ -42,8 +35,7 @@ if [ -f "${DATA_DIR}/.env" ]; then
     for LINE in $(cat ${DATA_DIR}/.env); do export $LINE; done
 fi
 # randomise any unset environment variables
-for ENV_VAR in "${ENV_VARS[@]}"
-do
+for ENV_VAR in "${ENV_VARS[@]}"; do
     if [[ -z "${!ENV_VAR}" ]]; then
         eval "export $ENV_VAR=$(uuidgen | sed -e 's/-//g')"
     fi
@@ -58,17 +50,15 @@ fi
 
 if [ ! -f "${DATA_DIR}/.env" ]; then
     touch ${DATA_DIR}/.env
-    for ENV_VAR in "${ENV_VARS[@]}"
-    do
+    for ENV_VAR in "${ENV_VARS[@]}"; do
         temp=$(eval "echo \$$ENV_VAR")
-        echo "$ENV_VAR=$temp" >> ${DATA_DIR}/.env
+        echo "$ENV_VAR=$temp" >>${DATA_DIR}/.env
     done
-    for ENV_VAR in "${DOCKER_VARS[@]}"
-    do
+    for ENV_VAR in "${DOCKER_VARS[@]}"; do
         temp=$(eval "echo \$$ENV_VAR")
-        echo "$ENV_VAR=$temp" >> ${DATA_DIR}/.env
+        echo "$ENV_VAR=$temp" >>${DATA_DIR}/.env
     done
-    echo "COUCH_DB_URL=${COUCH_DB_URL}" >> ${DATA_DIR}/.env
+    echo "COUCH_DB_URL=${COUCH_DB_URL}" >>${DATA_DIR}/.env
 fi
 
 # Read in the .env file and export the variables
@@ -79,31 +69,42 @@ ln -s ${DATA_DIR}/.env /worker/.env
 # make these directories in runner, incase of mount
 mkdir -p ${DATA_DIR}/minio
 mkdir -p ${DATA_DIR}/redis
-chown -R couchdb:couchdb ${DATA_DIR}/couch
+#mkdir -p ${DATA_DIR}/couch
+#chown -R couchdb:couchdb ${DATA_DIR}/couch
 
 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=""
+    REDIS_CONFIG=""
 fi
 
 if [[ -n "${REDIS_PASSWORD}" ]]; then
-  redis-server "${REDIS_CONFIG}" --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
+    redis-server "${REDIS_CONFIG}" --requirepass $REDIS_PASSWORD >/dev/stdout 2>&1 &
 else
-  redis-server "${REDIS_CONFIG}" > /dev/stdout 2>&1 &
+    redis-server "${REDIS_CONFIG}" >/dev/stdout 2>&1 &
 fi
 /bbcouch-runner.sh &
 
 # only start minio if use s3 isn't passed
 if [[ -z "${USE_S3}" ]]; then
-  /minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 &
+    if [[ $TARGETBUILD == aas ]]; then
+        echo "Starting MinIO in Azure Gateway mode"
+        if [[ -z "${AZURE_STORAGE_ACCOUNT}" || -z "${AZURE_STORAGE_KEY}" ]]; then
+            echo "AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY must be set when deploying in Azure App Service mode"
+            exit 1
+        fi
+        /minio/minio gateway azure --console-address ":9001" >/dev/stdout 2>&1 &
+    else
+        echo "Starting MinIO in standalone mode"
+        /minio/minio server --console-address ":9001" ${DATA_DIR}/minio >/dev/stdout 2>&1 &
+    fi
 fi
 
 /etc/init.d/nginx restart
 if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then
     # Add monthly cron job to renew certbot certificate
-    echo -n "* * 2 * * root exec /app/letsencrypt/certificate-renew.sh ${CUSTOM_DOMAIN}" >> /etc/cron.d/certificate-renew
+    echo -n "* * 2 * * root exec /app/letsencrypt/certificate-renew.sh ${CUSTOM_DOMAIN}" >>/etc/cron.d/certificate-renew
     chmod +x /etc/cron.d/certificate-renew
     # Request the certbot certificate
     /app/letsencrypt/certificate-request.sh ${CUSTOM_DOMAIN}

From 1650fdc75ea9fe5e15c9983fdd6f689f2a261b51 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 03:03:32 +0200
Subject: [PATCH 03/10] minio from dockerfile COPY

---
 scripts/install-minio.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/install-minio.sh b/scripts/install-minio.sh
index fede984377..b885453f2a 100755
--- a/scripts/install-minio.sh
+++ b/scripts/install-minio.sh
@@ -1,10 +1,18 @@
 #!/bin/bash
-if [[ $TARGETARCH == arm* ]] ;
-then
+
+if [[ $TARGETBUILD == "aas" ]]; then
+  echo "A aas-compatible version of Minio is already installed."
+  exit 0
+fi
+
+if [[ $TARGETARCH == arm* ]]; then
   echo "INSTALLING ARM64 MINIO"
+  rm -f minio
   wget https://dl.min.io/server/minio/release/linux-arm64/minio
 else
   echo "INSTALLING AMD64 MINIO"
+  rm -f minio
   wget https://dl.min.io/server/minio/release/linux-amd64/minio
 fi
-chmod +x minio
\ No newline at end of file
+
+chmod +x minio

From 32f6fc3d32cbef84cfbe619c563a78a5d720da80 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 03:09:14 +0200
Subject: [PATCH 04/10] add minio with gateway

---
 scripts/resources/minio | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 scripts/resources/minio

diff --git a/scripts/resources/minio b/scripts/resources/minio
new file mode 100644
index 0000000000..c121cc0963
--- /dev/null
+++ b/scripts/resources/minio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63db3aa3c2299ebaf13b46c64523a589bd5bf272f9e971d17f1eaa55f6f1fd79
+size 118595584

From 49dda35358abcc38d70577854491e447edae9b73 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 03:09:42 +0200
Subject: [PATCH 05/10] track minio in lfs

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..85b026dd08
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+scripts/resources/minio filter=lfs diff=lfs merge=lfs -text

From dba89a678c246dd2daaeb5e561452f3d9066e145 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 20:35:24 +0200
Subject: [PATCH 06/10] make minio binary executable

---
 hosting/single/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index 043cd3dd73..e6c1142ab8 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -70,6 +70,7 @@ WORKDIR /minio
 
 # a 2022 version of minio that supports gateway mode
 COPY scripts/resources/minio /minio
+RUN chmod +x minio
 
 # handles the installation of minio in non-aas environments
 COPY scripts/install-minio.sh ./install.sh

From afe293de5648dfa35b02e3552d5cb16d1c5ea9da Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 20:40:17 +0200
Subject: [PATCH 07/10] linting fix

---
 hosting/single/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index e6c1142ab8..1f449e7376 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -36,11 +36,11 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
 
 FROM $BASEIMG AS runner
 ARG TARGETARCH
-ENV TARGETARCH $TARGETARCH
+ENV TARGETARCH=$TARGETARCH
 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)
 # e.g. docker build --build-arg TARGETBUILD=aas ....
 ARG TARGETBUILD=single
-ENV TARGETBUILD $TARGETBUILD
+ENV TARGETBUILD=$TARGETBUILD
 
 # install base dependencies
 RUN apt-get update && \

From 18ddcd092ef7e77c48e4598166b69ef30a7c7e44 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 21:04:44 +0200
Subject: [PATCH 08/10] simplify env setup and handle MINIO_ missing

---
 hosting/single/runner.sh | 80 +++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index d6b77e9e42..42305cf62e 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -1,45 +1,57 @@
 #!/bin/bash
-declare -a ENV_VARS=("COUCHDB_USER" "COUCHDB_PASSWORD" "DATA_DIR" "MINIO_ACCESS_KEY" "MINIO_SECRET_KEY" "INTERNAL_API_KEY" "JWT_SECRET" "REDIS_PASSWORD")
-declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONMENT" "CLUSTER_PORT" "DEPLOYMENT_ENVIRONMENT" "MINIO_URL" "NODE_ENV" "POSTHOG_TOKEN" "REDIS_URL" "SELF_HOSTED" "WORKER_PORT" "WORKER_URL" "TENANT_FEATURE_FLAGS" "ACCOUNT_PORTAL_URL")
-# Check the env vars set in Dockerfile have come through, AAS seems to drop them
-[[ -z "${APP_PORT}" ]] && export APP_PORT=4001
-[[ -z "${ARCHITECTURE}" ]] && export ARCHITECTURE=amd
-[[ -z "${BUDIBASE_ENVIRONMENT}" ]] && export BUDIBASE_ENVIRONMENT=PRODUCTION
-[[ -z "${CLUSTER_PORT}" ]] && export CLUSTER_PORT=80
-[[ -z "${DEPLOYMENT_ENVIRONMENT}" ]] && export DEPLOYMENT_ENVIRONMENT=docker
-[[ -z "${MINIO_URL}" ]] && [[ -z "${USE_S3}" ]] && export MINIO_URL=http://127.0.0.1:9000
-[[ -z "${NODE_ENV}" ]] && export NODE_ENV=production
-[[ -z "${POSTHOG_TOKEN}" ]] && export POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-[[ -z "${ACCOUNT_PORTAL_URL}" ]] && export ACCOUNT_PORTAL_URL=https://account.budibase.app
-[[ -z "${REDIS_URL}" ]] && export REDIS_URL=127.0.0.1:6379
-[[ -z "${SELF_HOSTED}" ]] && export SELF_HOSTED=1
-[[ -z "${WORKER_PORT}" ]] && export WORKER_PORT=4002
-[[ -z "${WORKER_URL}" ]] && export WORKER_URL=http://127.0.0.1:4002
-[[ -z "${APPS_URL}" ]] && export APPS_URL=http://127.0.0.1:4001
-[[ -z "${SERVER_TOP_LEVEL_PATH}" ]] && export SERVER_TOP_LEVEL_PATH=/app
-#  export CUSTOM_DOMAIN=budi001.custom.com
 
-export DATA_DIR=${DATA_DIR:-/data}
-mkdir -p ${DATA_DIR}
-# Mount NFS or GCP Filestore if env vars exist for it
-if [[ ! -z ${FILESHARE_IP} && ! -z ${FILESHARE_NAME} ]]; then
+echo "Starting runner.sh"
+
+# set defaults for Docker-related variables
+export APP_PORT="${APP_PORT:-4001}"
+export ARCHITECTURE="${ARCHITECTURE:-amd}"
+export BUDIBASE_ENVIRONMENT="${BUDIBASE_ENVIRONMENT:-PRODUCTION}"
+export CLUSTER_PORT="${CLUSTER_PORT:-80}"
+export DEPLOYMENT_ENVIRONMENT="${DEPLOYMENT_ENVIRONMENT:-docker}"
+
+# only set MINIO_URL if neither MINIO_URL nor USE_S3 is set
+if [[ -z "${MINIO_URL}" && -z "${USE_S3}" ]]; then
+  export MINIO_URL="http://127.0.0.1:9000"
+fi
+
+export NODE_ENV="${NODE_ENV:-production}"
+export POSTHOG_TOKEN="${POSTHOG_TOKEN:-phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU}"
+export ACCOUNT_PORTAL_URL="${ACCOUNT_PORTAL_URL:-https://account.budibase.app}"
+export REDIS_URL="${REDIS_URL:-127.0.0.1:6379}"
+export SELF_HOSTED="${SELF_HOSTED:-1}"
+export WORKER_PORT="${WORKER_PORT:-4002}"
+export WORKER_URL="${WORKER_URL:-http://127.0.0.1:4002}"
+export APPS_URL="${APPS_URL:-http://127.0.0.1:4001}"
+export SERVER_TOP_LEVEL_PATH="${SERVER_TOP_LEVEL_PATH:-/app}"
+
+# set DATA_DIR and ensure the directory exists
+export DATA_DIR="${DATA_DIR:-/data}"
+mkdir -p "${DATA_DIR}"
+
+# mount NFS or GCP Filestore if FILESHARE_IP and FILESHARE_NAME are set
+if [[ -n "${FILESHARE_IP}" && -n "${FILESHARE_NAME}" ]]; then
     echo "Mounting NFS share"
     apt update && apt install -y nfs-common nfs-kernel-server
     echo "Mount file share ${FILESHARE_IP}:/${FILESHARE_NAME} to ${DATA_DIR}"
-    mount -o nolock ${FILESHARE_IP}:/${FILESHARE_NAME} ${DATA_DIR}
+    mount -o nolock "${FILESHARE_IP}:/${FILESHARE_NAME}" "${DATA_DIR}"
     echo "Mounting result: $?"
 fi
 
-if [ -f "${DATA_DIR}/.env" ]; then
-    # Read in the .env file and export the variables
-    for LINE in $(cat ${DATA_DIR}/.env); do export $LINE; done
+# source environment variables from a .env file if it exists in DATA_DIR
+if [[ -f "${DATA_DIR}/.env" ]]; then
+    set -a  # Automatically export all variables loaded from .env
+    source "${DATA_DIR}/.env"
+    set +a
 fi
-# randomise any unset environment variables
-for ENV_VAR in "${ENV_VARS[@]}"; do
-    if [[ -z "${!ENV_VAR}" ]]; then
-        eval "export $ENV_VAR=$(uuidgen | sed -e 's/-//g')"
+
+# randomize any unset sensitive environment variables using uuidgen
+env_vars=(COUCHDB_USER COUCHDB_PASSWORD MINIO_ACCESS_KEY MINIO_SECRET_KEY INTERNAL_API_KEY JWT_SECRET REDIS_PASSWORD)
+for var in "${env_vars[@]}"; do
+    if [[ -z "${!var}" ]]; then
+        export "$var"="$(uuidgen | tr -d '-')"
     fi
 done
+
 if [[ -z "${COUCH_DB_URL}" ]]; then
     export COUCH_DB_URL=http://$COUCHDB_USER:$COUCHDB_PASSWORD@127.0.0.1:5984
 fi
@@ -88,10 +100,10 @@ fi
 
 # only start minio if use s3 isn't passed
 if [[ -z "${USE_S3}" ]]; then
-    if [[ $TARGETBUILD == aas ]]; then
+    if [[ ${TARGETBUILD} == aas ]]; then
         echo "Starting MinIO in Azure Gateway mode"
-        if [[ -z "${AZURE_STORAGE_ACCOUNT}" || -z "${AZURE_STORAGE_KEY}" ]]; then
-            echo "AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY must be set when deploying in Azure App Service mode"
+        if [[ -z "${AZURE_STORAGE_ACCOUNT}" || -z "${AZURE_STORAGE_KEY}" || -z "${MINIO_ACCESS_KEY}" || -z "${MINIO_SECRET_KEY}" ]]; then
+            echo "The following environment variables must be set: AZURE_STORAGE_ACCOUNT, AZURE_STORAGE_KEY, MINIO_ACCESS_KEY, MINIO_SECRET_KEY"
             exit 1
         fi
         /minio/minio gateway azure --console-address ":9001" >/dev/stdout 2>&1 &

From 77f5c05a5b7fd39fc1fd26ffb2372dd548ce83c6 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 21:29:55 +0200
Subject: [PATCH 09/10] debug messages

---
 hosting/single/runner.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index 42305cf62e..6f81cc2fbd 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Starting runner.sh"
+echo "Starting runner.sh..."
 
 # set defaults for Docker-related variables
 export APP_PORT="${APP_PORT:-4001}"
@@ -96,7 +96,9 @@ if [[ -n "${REDIS_PASSWORD}" ]]; then
 else
     redis-server "${REDIS_CONFIG}" >/dev/stdout 2>&1 &
 fi
-/bbcouch-runner.sh &
+
+echo "Starting callback CouchDB runner..."
+./bbcouch-runner.sh &
 
 # only start minio if use s3 isn't passed
 if [[ -z "${USE_S3}" ]]; then

From bf2fcea4338b58259623c7ea0af2d3f9c5674be2 Mon Sep 17 00:00:00 2001
From: Christos Alexiou <christos@budibase.com>
Date: Thu, 20 Feb 2025 21:36:01 +0200
Subject: [PATCH 10/10] fix issue with couchdb startup

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

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index 6f81cc2fbd..1a81515d31 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -25,7 +25,11 @@ export APPS_URL="${APPS_URL:-http://127.0.0.1:4001}"
 export SERVER_TOP_LEVEL_PATH="${SERVER_TOP_LEVEL_PATH:-/app}"
 
 # set DATA_DIR and ensure the directory exists
-export DATA_DIR="${DATA_DIR:-/data}"
+if [[ ${TARGETBUILD} == "aas" ]]; then
+    export DATA_DIR="/home"
+else
+    export DATA_DIR="${DATA_DIR:-/data}"
+fi
 mkdir -p "${DATA_DIR}"
 
 # mount NFS or GCP Filestore if FILESHARE_IP and FILESHARE_NAME are set
@@ -81,8 +85,8 @@ ln -s ${DATA_DIR}/.env /worker/.env
 # make these directories in runner, incase of mount
 mkdir -p ${DATA_DIR}/minio
 mkdir -p ${DATA_DIR}/redis
-#mkdir -p ${DATA_DIR}/couch
-#chown -R couchdb:couchdb ${DATA_DIR}/couch
+mkdir -p ${DATA_DIR}/couch
+chown -R couchdb:couchdb ${DATA_DIR}/couch
 
 REDIS_CONFIG="/etc/redis/redis.conf"
 sed -i "s#DATA_DIR#${DATA_DIR}#g" "${REDIS_CONFIG}"