From fe36b76fe9a16f610a7763c0d7a34d01a59bb971 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 29 Jul 2024 18:56:15 +0100
Subject: [PATCH 1/2] Getting something working - using a different version and
 a pre-built image.

---
 .../scripts/integrations/oracle/docker-compose.yml    |  6 +++---
 .../server/src/integrations/tests/utils/oracle.ts     | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/server/scripts/integrations/oracle/docker-compose.yml b/packages/server/scripts/integrations/oracle/docker-compose.yml
index 586f0b683d..07992b6544 100644
--- a/packages/server/scripts/integrations/oracle/docker-compose.yml
+++ b/packages/server/scripts/integrations/oracle/docker-compose.yml
@@ -6,9 +6,9 @@ services:
   db:
     restart: unless-stopped
     platform: linux/x86_64
-    image: container-registry.oracle.com/database/express:18.4.0-xe
+    image: gvenzl/oracle-free:23.2-slim-faststart
     environment:
-      ORACLE_PWD: oracle
+      ORACLE_PWD: Password1
     ports:
       - 1521:1521
       - 5500:5500
@@ -16,4 +16,4 @@ services:
       - oracle_data:/opt/oracle/oradata
 
 volumes:
- oracle_data:
\ No newline at end of file
+ oracle_data:
diff --git a/packages/server/src/integrations/tests/utils/oracle.ts b/packages/server/src/integrations/tests/utils/oracle.ts
index 9b75a52da7..c904c094e1 100644
--- a/packages/server/src/integrations/tests/utils/oracle.ts
+++ b/packages/server/src/integrations/tests/utils/oracle.ts
@@ -7,8 +7,10 @@ import knex from "knex"
 let ports: Promise<testContainerUtils.Port[]>
 
 export async function getDatasource(): Promise<Datasource> {
+  // password needs to conform to Oracle standards
+  const password = "password"
   if (!ports) {
-    let image = "oracle/database:19.3.0.0-ee-slim-faststart"
+    let image = "gvenzl/oracle-free:23.2-slim-faststart"
     if (process.arch.startsWith("arm")) {
       image = "samhuang78/oracle-database:19.3.0-ee-slim-faststart"
     }
@@ -16,8 +18,10 @@ export async function getDatasource(): Promise<Datasource> {
     ports = startContainer(
       new GenericContainer(image)
         .withExposedPorts(1521)
-        .withEnvironment({ ORACLE_PASSWORD: "password" })
-        .withWaitStrategy(Wait.forHealthCheck().withStartupTimeout(60000))
+        .withEnvironment({
+          ORACLE_PASSWORD: password,
+        })
+        .withWaitStrategy(Wait.forLogMessage("DATABASE IS READY TO USE!"))
     )
   }
 
@@ -28,7 +32,6 @@ export async function getDatasource(): Promise<Datasource> {
 
   const host = "127.0.0.1"
   const user = "SYSTEM"
-  const password = "password"
 
   const datasource: Datasource = {
     type: "datasource_plus",

From d448f469f14ae1ed528f019d5bbf7b85214d442c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 29 Jul 2024 19:00:25 +0100
Subject: [PATCH 2/2] Updating image names.

---
 packages/server/src/integrations/tests/utils/oracle.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/tests/utils/oracle.ts b/packages/server/src/integrations/tests/utils/oracle.ts
index c904c094e1..5c788fd130 100644
--- a/packages/server/src/integrations/tests/utils/oracle.ts
+++ b/packages/server/src/integrations/tests/utils/oracle.ts
@@ -10,9 +10,11 @@ export async function getDatasource(): Promise<Datasource> {
   // password needs to conform to Oracle standards
   const password = "password"
   if (!ports) {
-    let image = "gvenzl/oracle-free:23.2-slim-faststart"
+    // couldn't build 19.3.0 for X64
+    let image = "budibase/oracle-database:23.2-slim-faststart"
     if (process.arch.startsWith("arm")) {
-      image = "samhuang78/oracle-database:19.3.0-ee-slim-faststart"
+      // there isn't an ARM compatible 23.2 build
+      image = "budibase/oracle-database:19.3.0-ee-slim-faststart"
     }
 
     ports = startContainer(