Merge pull request #154 from ubccr/isc-hpc-updates

Refactor initializing coldfront database

Author: aebruno

.env

@@ -2,4 +2,3 @@ HPCTS_VERSION="2023.05"
 SLURM_VERSION="21.08.8-2"
 MARIADB_VERSION=10.3
 MONGODB_VERSION=5.0
-COLDFRONT_RESTORE="true"

coldfront/entrypoint.sh

@@ -26,18 +26,13 @@ then
         echo "-- Initializing coldfront database..."
         coldfront initial_setup -f
 
-        echo "-- Generating static css files..."
-        coldfront collectstatic
-
         echo "-- Creating superuser..."
         echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@localhost', 'admin')" | \
                coldfront shell
     fi
 
-    if [ "$2" = "true" ]; then
-        echo "---> Restoring coldfront database..."
-        mysql --host mysql --user coldfrontapp --password=9obCuAphabeg coldfront < /usr/share/coldfront/coldfront.dump
-    fi
+    echo "-- Generating static css files..."
+    coldfront collectstatic
 
     echo "---> Starting nginx on coldfront..."
     /sbin/nginx

coldfront/coldfront.dump database/coldfront.dumpcoldfront/coldfront.dump renamed to database/coldfront.dump

@@ -16,3 +16,9 @@ EOF
 echo "Granting coldfront user access to coldfront database.."
 echo "grant all on coldfront.* to 'coldfrontapp'@'%';" | mysql -uroot
 echo "flush privileges;" | mysql -uroot
+
+
+if [ -f "/docker-entrypoint-initdb.d/coldfront.dump" ]; then
+    echo "Restoring coldfront database..."
+    mysql -uroot coldfront < /docker-entrypoint-initdb.d/coldfront.dump
+fi