From 0ed3b2802c56167fac1008aae94e8ee046303f3a Mon Sep 17 00:00:00 2001
From: Valentin <valentin@figureslibres.io>
Date: Thu, 28 Nov 2024 23:07:35 +0100
Subject: [PATCH] try to fix the policies sql import

---
 assets/caddy.docker-compose.yml    |  2 --
 assets/directus.docker-compose.yml |  1 -
 bin/add-site/install_directus.sh   | 15 ++++++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/assets/caddy.docker-compose.yml b/assets/caddy.docker-compose.yml
index 07ed2a9..0209eca 100644
--- a/assets/caddy.docker-compose.yml
+++ b/assets/caddy.docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 networks:
   web:
     external: true
diff --git a/assets/directus.docker-compose.yml b/assets/directus.docker-compose.yml
index f3b6aee..e8c5a40 100644
--- a/assets/directus.docker-compose.yml
+++ b/assets/directus.docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   database:
     container_name: ${PROJECT_NAME}_Directus_DB
diff --git a/bin/add-site/install_directus.sh b/bin/add-site/install_directus.sh
index 2a249cc..6975666 100644
--- a/bin/add-site/install_directus.sh
+++ b/bin/add-site/install_directus.sh
@@ -5,7 +5,6 @@ check_global_const DOMAIN_NAME USERNAME CADDYFILE IP SSH_PORT
 mkdir "/home/${USERNAME}/cms.${DOMAIN_NAME}"
 cp assets/directus.docker-compose.yml "/home/${USERNAME}/cms.${DOMAIN_NAME}/docker-compose.yml"
 cp assets/setup_mariadb.sql "/home/${USERNAME}/cms.${DOMAIN_NAME}/setup_mariadb.sql"
-cp assets/directus_policies.sql "/home/${USERNAME}/cms.${DOMAIN_NAME}/directus_policies.sql"
 cp assets/.env.example "/home/${USERNAME}/cms.${DOMAIN_NAME}/.env"
 
 sed -i "s/^PROJECT_NAME=.*/PROJECT_NAME=${DOMAIN_NAME}/" "/home/${USERNAME}/cms.${DOMAIN_NAME}/.env"
@@ -32,8 +31,18 @@ sed -i "s/^PORT=.*/PORT=${port}/" "/home/${USERNAME}/cms.${DOMAIN_NAME}/.env"
 # Start the services using Docker Compose
 docker compose -f "/home/${USERNAME}/cms.${DOMAIN_NAME}/docker-compose.yml" up -d
 
-docker cp "/home/${USERNAME}/cms.${DOMAIN_NAME}/directus_policies.sql" "${DOMAIN_NAME}_Directus_DB:/directus_policies.sql"
-docker exec -i "${DOMAIN_NAME}_Directus_DB" sh -c "mariadb -uroot directus < /directus_policies.sql"
+# Wait for the database to be ready
+echo "Waiting for Directus database to be ready..."
+until docker exec -i "${DOMAIN_NAME}_Directus_DB" mariadb -uroot -e "SELECT 1 FROM directus.directus_roles LIMIT 1" &> /dev/null
+do
+  echo "Database not ready yet... waiting 5 seconds"
+  sleep 5
+done
+
+docker cp assets/directus_policies.sql "${DOMAIN_NAME}_Directus_DB:/directus_policies.sql"
+docker exec -i "${DOMAIN_NAME}_Directus_DB" sh -c "
+    mariadb -uroot directus < /directus_policies.sql
+"
 
 # docker exec -i "${DOMAIN_NAME}_Directus" sh -c "npx directus roles create --role Website && npx directus roles create --role User"