X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker%2Fui%2Fdeploy.sh;h=8e782c65add551171f893c607f78fc9a4b5e1776;hb=0a46c82e91de6d98c02bd67f70f024bd95751a64;hp=388cb9cc427adf663ad6fc5cf162b1435d01243a;hpb=8bb3d5cff89f74e54fafe37f47392d487323a353;p=validation.git

diff --git a/docker/ui/deploy.sh b/docker/ui/deploy.sh
index 388cb9c..8e782c6 100755
--- a/docker/ui/deploy.sh
+++ b/docker/ui/deploy.sh
@@ -24,7 +24,7 @@ NAME=validation
 TAG_PRE=ui
 TAG_VER=latest
 # Container input parameters
-MARIADB_AKRAINO_PASSWORD=""
+MYSQL_AKRAINO_PASSWORD=""
 JENKINS_URL="https://jenkins.akraino.org/"
 JENKINS_USERNAME="demo"
 JENKINS_USER_PASSWORD="demo"
@@ -33,6 +33,8 @@ DB_IP_PORT=""
 NEXUS_PROXY=""
 JENKINS_PROXY=""
 CERTDIR=$(pwd)
+ENCRYPTION_KEY=""
+UI_ADMIN_PASSWORD=""
 
 for ARGUMENT in "$@"
 do
@@ -43,7 +45,7 @@ do
             NAME)    NAME=${VALUE} ;;
             TAG_PRE)    TAG_PRE=${VALUE} ;;
             TAG_VER)    TAG_VER=${VALUE} ;;
-            MARIADB_AKRAINO_PASSWORD)    MARIADB_AKRAINO_PASSWORD=${VALUE} ;;
+            MYSQL_AKRAINO_PASSWORD)    MYSQL_AKRAINO_PASSWORD=${VALUE} ;;
             JENKINS_URL)    JENKINS_URL=${VALUE} ;;
             JENKINS_USERNAME)    JENKINS_USERNAME=${VALUE} ;;
             JENKINS_USER_PASSWORD)    JENKINS_USER_PASSWORD=${VALUE} ;;
@@ -53,6 +55,8 @@ do
             NEXUS_PROXY) NEXUS_PROXY=${VALUE} ;;
             JENKINS_PROXY) JENKINS_PROXY=${VALUE} ;;
             CERTDIR) CERTDIR=${VALUE} ;;
+            ENCRYPTION_KEY) ENCRYPTION_KEY=${VALUE} ;;
+            UI_ADMIN_PASSWORD) UI_ADMIN_PASSWORD=${VALUE} ;;
             *)
     esac
 done
@@ -63,12 +67,26 @@ if [ -z "$DB_IP_PORT" ]
     exit 1
 fi
 
-if [ -z "$MARIADB_AKRAINO_PASSWORD" ]
+if [ -z "$MYSQL_AKRAINO_PASSWORD" ]
   then
-    echo "ERROR: You must specify the mariadb akraino user password"
+    echo "ERROR: You must specify the mysql akraino user password"
     exit 1
 fi
 
+if [ -z "$ENCRYPTION_KEY" ]
+  then
+    echo "ERROR: You must specify the encryption key"
+    exit 1
+fi
+
+if [ -z "$UI_ADMIN_PASSWORD" ]
+  then
+    echo "ERROR: You must specify the UI admin password"
+    exit 1
+fi
+
+echo "Note: If there is a password already stored in database, the supplied UI_ADMIN_PASSWORD will be ignored."
+
 IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
-docker run --detach --name $CONTAINER_NAME --network="host" -v "$(pwd)/server.xml:/usr/local/tomcat/conf/server.xml" -v "$CERTDIR/bluval.key:/usr/local/tomcat/bluval.key" -v "$CERTDIR/bluval.crt:/usr/local/tomcat/bluval.crt" -v "$(pwd)/root_index.jsp:/usr/local/tomcat/webapps/ROOT/index.jsp" -e DB_IP_PORT="$DB_IP_PORT" -e MARIADB_AKRAINO_PASSWORD="$MARIADB_AKRAINO_PASSWORD" -e JENKINS_URL="$JENKINS_URL" -e JENKINS_USERNAME="$JENKINS_USERNAME" -e JENKINS_USER_PASSWORD="$JENKINS_USER_PASSWORD" -e JENKINS_JOB_NAME="$JENKINS_JOB_NAME" -e NEXUS_PROXY="$NEXUS_PROXY" -e JENKINS_PROXY="$JENKINS_PROXY" $IMAGE
+docker run --detach --name $CONTAINER_NAME --network="host" -v "$(pwd)/server.xml:/usr/local/tomcat/conf/server.xml" -v "$CERTDIR/bluval.key:/usr/local/tomcat/bluval.key" -v "$CERTDIR/bluval.crt:/usr/local/tomcat/bluval.crt" -v "$(pwd)/root_index.jsp:/usr/local/tomcat/webapps/ROOT/index.jsp" -e DB_IP_PORT="$DB_IP_PORT" -e MYSQL_AKRAINO_PASSWORD="$MYSQL_AKRAINO_PASSWORD" -e JENKINS_URL="$JENKINS_URL" -e JENKINS_USERNAME="$JENKINS_USERNAME" -e JENKINS_USER_PASSWORD="$JENKINS_USER_PASSWORD" -e JENKINS_JOB_NAME="$JENKINS_JOB_NAME" -e NEXUS_PROXY="$NEXUS_PROXY" -e JENKINS_PROXY="$JENKINS_PROXY" -e ENCRYPTION_KEY="$ENCRYPTION_KEY" -e UI_ADMIN_PASSWORD="$UI_ADMIN_PASSWORD" $IMAGE
 sleep 10