X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fmysql%2Fdeploy.sh;h=2a6218460ca72ea9df0a08d9b4ddeaf66dda599e;hp=7357cd14edfb937053ffb5a5955499dbc3a435a9;hb=291b699220dc09c94211a56575b92e71056f261c;hpb=0a46c82e91de6d98c02bd67f70f024bd95751a64

diff --git a/docker/mysql/deploy.sh b/docker/mysql/deploy.sh
index 7357cd1..2a62184 100755
--- a/docker/mysql/deploy.sh
+++ b/docker/mysql/deploy.sh
@@ -23,7 +23,8 @@ DOCKER_VOLUME_NAME="akraino-validation-mysql"
 CONTAINER_NAME="akraino-validation-mysql"
 # Container input variables
 MYSQL_ROOT_PASSWORD=""
-MYSQL_AKRAINO_PASSWORD=""
+MYSQL_USER="akraino"
+MYSQL_PASSWORD=""
 # Image data
 REGISTRY=akraino
 NAME=validation
@@ -31,21 +32,12 @@ TAG_PRE=mysql
 TAG_VER=latest
 MYSQL_HOST_PORT=3307
 
-for ARGUMENT in "$@"
-do
-    KEY=$(echo $ARGUMENT | cut -f1 -d=)
-    VALUE=$(echo $ARGUMENT | cut -f2 -d=)
-    case "$KEY" in
-            REGISTRY)              REGISTRY=${VALUE} ;;
-            NAME)    NAME=${VALUE} ;;
-            TAG_VER)    TAG_VER=${VALUE} ;;
-            TAG_PRE)    TAG_PRE=${VALUE} ;;
-            MYSQL_ROOT_PASSWORD)    MYSQL_ROOT_PASSWORD=${VALUE} ;;
-            MYSQL_AKRAINO_PASSWORD)    MYSQL_AKRAINO_PASSWORD=${VALUE} ;;
-            CONTAINER_NAME)    CONTAINER_NAME=${VALUE} ;;
-            MYSQL_HOST_PORT)    MYSQL_HOST_PORT=${VALUE} ;;
-            *)
-    esac
+while [ $# -gt 0 ]; do
+   if [[ $1 == *"--"* ]]; then
+        v="${1/--/}"
+        declare $v="$2"
+   fi
+   shift
 done
 
 if [ -z "$MYSQL_ROOT_PASSWORD" ]
@@ -54,13 +46,13 @@ if [ -z "$MYSQL_ROOT_PASSWORD" ]
     exit 1
 fi
 
-if [ -z "$MYSQL_AKRAINO_PASSWORD" ]
+if [ -z "$MYSQL_PASSWORD" ]
   then
-    echo "ERROR: You must specify the mysql database akraino user password"
+    echo "ERROR: You must specify the mysql database user password"
     exit 1
 fi
 
 IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
 chmod 0444 "/$(pwd)/mysql.conf"
-docker run --detach --name $CONTAINER_NAME --publish $MYSQL_HOST_PORT:3306 -v $DOCKER_VOLUME_NAME:/var/lib/mysql -v "/$(pwd)/mysql.conf:/etc/mysql/conf.d/my.cnf" -e MYSQL_ROOT_PASSWORD="$MYSQL_ROOT_PASSWORD" -e MYSQL_DATABASE="akraino_bluvalui" -e MYSQL_USER="akraino" -e MYSQL_PASSWORD="$MYSQL_AKRAINO_PASSWORD" $IMAGE
+docker run --detach --name $CONTAINER_NAME --publish $MYSQL_HOST_PORT:3306 -v $DOCKER_VOLUME_NAME:/var/lib/mysql -v "$(pwd)/mysql.conf:/etc/mysql/conf.d/my.cnf" -e MYSQL_ROOT_PASSWORD="$MYSQL_ROOT_PASSWORD" -e MYSQL_DATABASE="akraino_bluvalui" -e MYSQL_USER="$MYSQL_USER" -e MYSQL_PASSWORD="$MYSQL_PASSWORD" $IMAGE
 sleep 10