Merge pull request #337 from EscolaLMS/feature/wait_script

cleanup & wait script
EscolaLMS · Oct 1, 2024 · 8584fec · 8584fec
2 parents 0097fbb + c9cf36d
commit 8584fec
Show file tree

Hide file tree

Showing 18 changed files with 156 additions and 1,133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,4 +71,6 @@ tests/coverage.txt
 caddy/
 !docker/conf/caddy
 
-docker-compose.saas.yml
+docker-compose.saas.yml
+
+inited
diff --git a/composer.lock b/composer.lock
diff --git a/...ie-elementy-twoich-ulubionych-aplikacji-i-gier-probuja-wzbudzic-w-1291425493663515597.h5p b/...ie-elementy-twoich-ulubionych-aplikacji-i-gier-probuja-wzbudzic-w-1291425493663515597.h5p
diff --git a/...rzystasz-z-kilku-aplikacji-jednoczesnie-dopamina-i-skrajne-emocje-1291425501575271257.h5p b/...rzystasz-z-kilku-aplikacji-jednoczesnie-dopamina-i-skrajne-emocje-1291425501575271257.h5p
diff --git a/database/seeds/cyfrowy_dobrostan/h5p/dopamina-i-skrajne-emocje-1291425504141445257.h5p b/database/seeds/cyfrowy_dobrostan/h5p/dopamina-i-skrajne-emocje-1291425504141445257.h5p
diff --git a/database/seeds/cyfrowy_dobrostan/h5p/essay-1291425512151358697.h5p b/database/seeds/cyfrowy_dobrostan/h5p/essay-1291425512151358697.h5p
diff --git a/database/seeds/cyfrowy_dobrostan/h5p/rekomendacje-1291425514414841837.h5p b/database/seeds/cyfrowy_dobrostan/h5p/rekomendacje-1291425514414841837.h5p
diff --git a/database/seeds/cyfrowy_dobrostan/images/cyfrowy_dobrostan.jpeg b/database/seeds/cyfrowy_dobrostan/images/cyfrowy_dobrostan.jpeg
diff --git a/database/seeds/cyfrowy_dobrostan/images/wojewodzic.png b/database/seeds/cyfrowy_dobrostan/images/wojewodzic.png
diff --git a/database/seeds/cyfrowy_dobrostan/lessons.php b/database/seeds/cyfrowy_dobrostan/lessons.php
diff --git a/database/seeds/cyfrowy_dobrostan/texts.php b/database/seeds/cyfrowy_dobrostan/texts.php
diff --git a/database/seeds/cyfrowy_dobrostan/topics.php b/database/seeds/cyfrowy_dobrostan/topics.php
diff --git a/database/seeds/cyfrowy_dobrostan/videos.php b/database/seeds/cyfrowy_dobrostan/videos.php
diff --git a/database/seeds/cyfrowy_dobrostan/videos/.gitignore b/database/seeds/cyfrowy_dobrostan/videos/.gitignore
diff --git a/init.sh b/init.sh
@@ -2,6 +2,8 @@
 
 # disable paritcular supervisor job by deleting jobs files 
 
+rm inited
+
 if [ -n "$MULTI_DOMAINS" ]
 then
   ./init_multidomains.sh
@@ -94,6 +96,8 @@ fi
 
 php artisan h5p:storage-link
 
+touch inited
+
 /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
 
 
diff --git a/init_multidomains.sh b/init_multidomains.sh
@@ -137,4 +137,6 @@ else
   echo "Environment variable MULTI_DOMAINS is empty."
 fi
 
+touch inited
+
 /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
diff --git a/makefile b/makefile
@@ -83,3 +83,6 @@ import-postgres:
 	- docker compose exec postgres bash -c "psql --dbname=$(POSTGRES_DB) < /var/lib/postgresql/backups/$(BACKUP_FILE)"
 
 init: docker-up switch-to-postgres composer-update migrate-fresh-quick
+
+wait: 
+	- docker compose exec --user=1000 escola_lms_app bash -c "./wait.sh"
diff --git a/wait.sh b/wait.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# After 60 seconds the loop will exit
+timeout=120
+
+while [ ! -f inited ];
+do
+  # When the timeout is equal to zero, show an error and leave the loop.
+  if [ "$timeout" == 0 ]; then
+    echo "ERROR: Timeout while waiting for the file 'inited'"
+    exit 1
+  fi
+
+  sleep 1
+
+  # Decrease the timeout of one
+  ((timeout--))
+done