System tests use new lauth_demo db

mlibrary · Nov 20, 2023 · fff832f · fff832f
1 parent 50e1e05
commit fff832f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/db/setup.sh b/db/setup.sh
@@ -2,14 +2,15 @@
 
 directory=$(dirname "$0")
 
-while getopts u:p:h:P: option
+while getopts u:p:h:P:a option
 do
     case "${option}"
         in
         u)u=${OPTARG};;
         p)p=${OPTARG};;
         h)h=${OPTARG};;
         P)P=${OPTARG};;
+        a)all="true";;
     esac
 done
 
@@ -28,11 +29,17 @@ echo " password : $password"
 echo "     host : $host"
 echo "     port : $port"
 echo " database : $database"
+echo " add data : ${all:=false}"
+echo ""
+
 
 mariadb -u root --host=$host --port=$port -e "CREATE DATABASE ${database} DEFAULT CHARACTER SET utf8"
 mariadb -u root --host=$host --port=$port -e "GRANT ALL ON ${database}.* TO ${user}@'%' IDENTIFIED by '${password}'"
 
 mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/tables.sql"
-# mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/root.sql"
-# mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/keys.sql"
-# mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/test-fixture.sql"
+
+if [[ $all == "true" ]]; then
+  mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/root.sql"
+  mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/keys.sql"
+  mariadb --user=$user --host=$host --port=$port --password=$password $database < "$directory/test-fixture.sql"
+fi
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       args:
         UID: ${UID:-1000}
         GID: ${GID:-1000}
+    environment:
+      - DATABASE_URL=mysql2://lauth:[email protected]:3306/lauth_demo
     hostname: app.lauth.local
     networks:
       default:
@@ -156,7 +158,9 @@ services:
     command:
       - /bin/bash
       - "-c"
-      - "/sql/setup.sh -u lauth -p lauth -h db.lauth.local lauth_development && /sql/setup.sh -u lauth -p lauth -h db.lauth.local lauth_test"
+      - "/sql/setup.sh -u lauth -p lauth -h db.lauth.local lauth_development && \
+         /sql/setup.sh -u lauth -p lauth -h db.lauth.local lauth_test && \
+         /sql/setup.sh -u lauth -p lauth -h db.lauth.local -a lauth_demo"
 
 volumes:
   mariadb_data: