From 855cfa4b2a74fd4e11937938f405bb8e62e310d7 Mon Sep 17 00:00:00 2001
From: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Date: Thu, 17 Oct 2024 10:10:37 +0200
Subject: [PATCH] feat: add basic support for Oracle DB

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
---
 docker-compose.yml      | 12 ++++++------
 docker/bin/bootstrap.sh |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index efd3a7d..e967291 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -665,14 +665,13 @@ services:
       - postgres:/var/lib/postgresql
 
   database-oci:
-    image: ghcr.io/gvenzl/oracle-xe:21
+    image: gvenzl/oracle-free:23
     environment:
-      ORACLE_PASSWORD: nextcloud
-      APP_USER: nextcloud
-      APP_USER_PASSWORD: nextcloud
-      ORACLE_DATABASE: nextcloud
+      ORACLE_PASSWORD: oracle
     ports:
-      - 1521:1521/tcp
+      - 1521:1521
+    volumes:
+      - oracle:/opt/oracle/oradata
 
   pgadmin:
     container_name: pgadmin_container
@@ -1080,6 +1079,7 @@ volumes:
   apps-writable:
   mysql:
   postgres:
+  oracle:
   redis:
   data2:
   config2:
diff --git a/docker/bin/bootstrap.sh b/docker/bin/bootstrap.sh
index 1b47558..881e4ff 100755
--- a/docker/bin/bootstrap.sh
+++ b/docker/bin/bootstrap.sh
@@ -100,7 +100,7 @@ wait_for_other_containers() {
 		"oci")
 			output " - Oracle"
 			retry_with_timeout "(echo > /dev/tcp/database-$SQL/1521) 2>/dev/null" 30 "⚠ Unable to connect to the Oracle server"
-			sleep 2
+			sleep 45
 			;;
 		"sqlite")
 			output " - SQLite"
@@ -233,7 +233,7 @@ install() {
 
 	output "🔧 Starting auto installation"
 	if [ "$SQL" = "oci" ]; then
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name=nextcloud --database-host="$SQLHOST" --database-port=1521 --database-user=nextcloud --database-pass=nextcloud
+		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name=FREE --database-host="$SQLHOST" --database-port=1521 --database-user=system --database-pass=oracle
 	elif [ "$SQL" = "pgsql" ]; then
 		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name="$DBNAME" --database-host="$SQLHOST" --database-user=postgres --database-pass=postgres
 	elif [ "$SQL" = "mysql" ]; then