Release SQS for self-host users (single image, docker compose, Kubernetes)

hosting/docker-compose.yaml

@@ -27,6 +27,8 @@ services:
       BB_ADMIN_USER_PASSWORD: ${BB_ADMIN_USER_PASSWORD}
       PLUGINS_DIR: ${PLUGINS_DIR}
       OFFLINE_MODE: ${OFFLINE_MODE:-}
+      SQS_SEARCH_ENABLE: "true"
+      COUCH_DB_SQL_URL: "http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:4984"
     depends_on:
       - worker-service
       - redis-service
@@ -54,6 +56,8 @@ services:
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       OFFLINE_MODE: ${OFFLINE_MODE:-}
+      SQS_SEARCH_ENABLE: "true"
+      COUCH_DB_SQL_URL: "http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:4984"
     depends_on:
       - redis-service
       - minio-service
@@ -97,7 +101,7 @@ services:
 
   couchdb-service:
     restart: unless-stopped
-    image: budibase/couchdb
+    image: budibase/couchdb:v3.3.3-sqs
     environment:
       - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
       - COUCHDB_USER=${COUCH_DB_USER}

packages/cli/src/hosting/utils.ts

@@ -1,7 +1,7 @@
 import { lookpath } from "lookpath"
 import fs from "fs"
 import * as makeFiles from "./makeFiles"
 import { logErrorToFile, downloadFile, error } from "../utils"
 import yaml from "yaml"
 import { DockerCompose } from "./types"
 
@@ -46,7 +46,8 @@
 export async function downloadDockerCompose() {
   const filename = composeFilename()
   try {
-    await downloadFile(COMPOSE_URL, `./${filename}`)
+    fs.copyFileSync("../../hosting/docker-compose.yaml", `./${filename}`)
+    //await downloadFile(COMPOSE_URL, `./${filename}`)
   } catch (err) {
     console.error(error(`Failed to retrieve compose file - ${err}`))
   }

packages/frontend-core/src/components/Updating.svelte

@@ -2,36 +2,30 @@
   export let isMigrationDone
   export let onMigrationDone
   export let timeoutSeconds = 60 // 1 minute
-  export let minTimeSeconds = 3
 
-  const loadTime = Date.now()
-  const intervalMs = 1000
   let timedOut = false
-  let secondsWaited = 0
 
   async function checkMigrationsFinished() {
-    setTimeout(async () => {
-      const isMigrated = await isMigrationDone()
-
-      const timeoutMs = timeoutSeconds * 1000
-      if (!isMigrated || secondsWaited <= minTimeSeconds) {
-        if (loadTime + timeoutMs > Date.now()) {
-          secondsWaited += 1
-          return checkMigrationsFinished()
-        }
+    let totalWaitMs = 0
+    while (true) {
+      const waitForMs = 5000 + Math.random() * 5000
+      await new Promise(resolve => setTimeout(resolve, waitForMs))
+      totalWaitMs += waitForMs
 
-        return migrationTimeout()
+      const isMigrated = await isMigrationDone()
+      if (isMigrated) {
+        onMigrationDone()
+        return
       }
 
-      onMigrationDone()
-    }, intervalMs)
+      if (totalWaitMs > timeoutSeconds * 1000) {
+        timedOut = true
+        return
+      }
+    }
   }
 
   checkMigrationsFinished()
-
-  function migrationTimeout() {
-    timedOut = true
-  }
 </script>
 
 <div class="loading" class:timeout={timedOut}>