[UI] Support user creation

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

diff --git a/docker/mariadb/deploy.sh b/docker/mariadb/deploy.sh
index b3fea76..f727ed5 100755 (executable)
--- a/docker/mariadb/deploy.sh
+++ b/docker/mariadb/deploy.sh
@@ -24,9 +24,6 @@ CONTAINER_NAME="akraino-validation-mariadb"
 # Container input variables
 MARIADB_ROOT_PASSWORD=""
 MARIADB_AKRAINO_PASSWORD=""
-UI_ADMIN_PASSWORD=""
-UI_AKRAINO_PASSWORD=""
-ENCRYPTION_KEY=""
 # Image data
 REGISTRY=akraino
 NAME=validation
@@ -47,9 +44,6 @@ do
             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} ;;
-            ENCRYPTION_KEY)    ENCRYPTION_KEY=${VALUE} ;;
             *)
     esac
 done
@@ -66,26 +60,7 @@ if [ -z "$MARIADB_AKRAINO_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" ]
-  then
-    echo "ERROR: You must specify the password for the UI akraino user"
-    exit 1
-fi
-
-if [ -z "$ENCRYPTION_KEY" ]
-  then
-    echo "ERROR: You must specify the encryption key"
-    exit 1
-fi
-
 IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
 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" -e UI_ADMIN_PASSWORD="$UI_ADMIN_PASSWORD" -e UI_AKRAINO_PASSWORD="$UI_AKRAINO_PASSWORD" -e ENCRYPTION_KEY="$ENCRYPTION_KEY" $IMAGE
-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; echo "UPDATE fn_user SET LOGIN_PWD = HEX(AES_ENCRYPT(LOGIN_PWD, \"$ENCRYPTION_KEY\"))" >> /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 ;'
+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