[UI] Support user creation

[validation.git] / docker / mariadb / deploy.sh

diff --git a/docker/mariadb/deploy.sh b/docker/mariadb/deploy.sh
index fec5a2c..f727ed5 100755 (executable)
--- a/docker/mariadb/deploy.sh
+++ b/docker/mariadb/deploy.sh
@@ -16,14 +16,14 @@
 
 # Use this script if the persistent storage does not exist
 
-# Directory on host in where database data will be stored
-HOST_STORAGE_DIR="/var/lib/mariadb"
+set -ex
+
+DOCKER_VOLUME_NAME="akraino-validation-mariadb"
 # Container name
 CONTAINER_NAME="akraino-validation-mariadb"
 # Container input variables
 MARIADB_ROOT_PASSWORD=""
-UI_ADMIN_PASSWORD=""
-UI_AKRAINO_PASSWORD=""
+MARIADB_AKRAINO_PASSWORD=""
 # Image data
 REGISTRY=akraino
 NAME=validation
@@ -41,10 +41,9 @@ do
             TAG_VER)    TAG_VER=${VALUE} ;;
             TAG_PRE)    TAG_PRE=${VALUE} ;;
             MARIADB_ROOT_PASSWORD)    MARIADB_ROOT_PASSWORD=${VALUE} ;;
+            MARIADB_AKRAINO_PASSWORD)    MARIADB_AKRAINO_PASSWORD=${VALUE} ;;
             CONTAINER_NAME)    CONTAINER_NAME=${VALUE} ;;
             MARIADB_HOST_PORT)    MARIADB_HOST_PORT=${VALUE} ;;
-            UI_ADMIN_PASSWORD)    UI_ADMIN_PASSWORD=${VALUE} ;;
-            UI_AKRAINO_PASSWORD)    UI_AKRAINO_PASSWORD=${VALUE} ;;
             *)
     esac
 done
@@ -55,19 +54,13 @@ if [ -z "$MARIADB_ROOT_PASSWORD" ]
     exit 1
 fi
 
-if [ -z "$UI_ADMIN_PASSWORD" ]
-  then
-    echo "ERROR: You must specify the password of the UI admin user"
-    exit 1
-fi
-
-if [ -z "$UI_AKRAINO_PASSWORD" ]
+if [ -z "$MARIADB_AKRAINO_PASSWORD" ]
   then
-    echo "ERROR: You must specify the password for the UI akraino user"
+    echo "ERROR: You must specify the mariadb database akraino user password"
     exit 1
 fi
 
 IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
-docker run --detach --name $CONTAINER_NAME --publish $MARIADB_HOST_PORT:3306 --volume $HOST_STORAGE_DIR:/var/lib/mysql -v "/$(pwd)/mariadb.conf:/etc/mysql/conf.d/my.cnf" -e MYSQL_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD" -e UI_ADMIN_PASSWORD="$UI_ADMIN_PASSWORD" -e UI_AKRAINO_PASSWORD="$UI_AKRAINO_PASSWORD" $IMAGE
+chmod 0444 "/$(pwd)/mariadb.conf"
+docker run --detach --name $CONTAINER_NAME --publish $MARIADB_HOST_PORT:3306 -v $DOCKER_VOLUME_NAME:/var/lib/mysql -v "/$(pwd)/mariadb.conf:/etc/mysql/conf.d/my.cnf" -e MYSQL_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD" -e MYSQL_DATABASE="akraino" -e MYSQL_USER="akraino" -e MYSQL_PASSWORD="$MARIADB_AKRAINO_PASSWORD" $IMAGE
 sleep 10
-docker exec $CONTAINER_NAME /bin/bash -c 'sed -i 's/admin_password/'"$UI_ADMIN_PASSWORD"'/g' /docker-entrypoint-initdb.d/EcompSdkDMLMySql_2_4_OS.sql ; sed -i 's/akraino_password/'"$UI_AKRAINO_PASSWORD"'/g' /docker-entrypoint-initdb.d/EcompSdkDMLMySql_2_4_OS.sql; continue=`ps aux | grep mysql` ; while [ -z "$continue" ]; do continue=`ps aux | grep mysql`; sleep 5; done ; sleep 10 ;'