From 0e01f7118fb265f6f6558fd9c63eb516581c1bee Mon Sep 17 00:00:00 2001
From: jc0b <j.burley@vu.nl>
Date: Tue, 9 Jun 2020 14:19:54 +0200
Subject: progress so far (for remote)

---
 build/configure.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'build')

diff --git a/build/configure.sh b/build/configure.sh
index eb7324d2..fcb33b1a 100755
--- a/build/configure.sh
+++ b/build/configure.sh
@@ -22,20 +22,20 @@ done
 
 echo "MariaDB available"
 
-NUM_TABLES=$(eval "$MYSQL_COMMAND -B --disable-column-names -e \"SELECT count(*) FROM information_schema.tables WHERE table_schema='$MYSQL_DATABASE';\"")
+#NUM_TABLES=$(eval "$MYSQL_COMMAND -B --disable-column-names -e \"SELECT count(*) FROM information_schema.tables WHERE table_schema='$MYSQL_DATABASE';\"")
 
 # Check if database is empty
-if [ "$NUM_TABLES" -eq 0 ]; then
-	eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/schema.sql
-	eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/test.sql
-fi
+#if [ "$NUM_TABLES" -eq 0 ]; then
+#	eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/schema.sql
+#	eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/test.sql
+#fi
 
 # Writing databse config values to keys.json
 cat keys.json | python -c "import os, sys, json; ks = json.load(sys.stdin); \
-    ks['MYSQL_HOST'] = 'mariadb'; \
-    ks['MYSQL_PORT'] = '3306'; \
-    ks['MYSQL_DATABASE'] = os.environ['MYSQL_DATABASE']; \
-    ks['MYSQL_USER'] = os.environ['MYSQL_USER']; \
-    ks['MYSQL_PASSWORD'] = os.environ['MYSQL_PASSWORD']; \
+    ks['MONGODB_HOST'] = 'mongo'; \
+    ks['MONGODB_PORT'] = '27017'; \
+    ks['MONGODB_DATABASE'] = os.environ['MONGO_DB']; \
+    ks['MYSQL_USER'] = os.environ['MONGO_DB_USER']; \
+    ks['MYSQL_PASSWORD'] = os.environ['MONGO_DB_PASSWORD']; \
     print json.dumps(ks, indent=4)" > new_keys.json
 mv new_keys.json keys.json
-- 
cgit v1.2.3