X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fui%2Fdeploy.sh;h=388cb9cc427adf663ad6fc5cf162b1435d01243a;hp=c1be67453f8a6c358e7d43ef8ea9264231b4a225;hb=f0359240d6f093f08eca0a077a37ab3b5b842765;hpb=5209bb26e2b70f6eefbccf61713dc2633751b86b

diff --git a/docker/ui/deploy.sh b/docker/ui/deploy.sh
index c1be674..388cb9c 100755
--- a/docker/ui/deploy.sh
+++ b/docker/ui/deploy.sh
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -ex
+
 # Container name
 CONTAINER_NAME="akraino-validation-ui"
 # Image data
@@ -23,13 +25,14 @@ TAG_PRE=ui
 TAG_VER=latest
 # Container input parameters
 MARIADB_AKRAINO_PASSWORD=""
-JENKINS_URL=""
-JENKINS_USERNAME=""
-JENKINS_USER_PASSWORD=""
-JENKINS_JOB_NAME=""
+JENKINS_URL="https://jenkins.akraino.org/"
+JENKINS_USERNAME="demo"
+JENKINS_USER_PASSWORD="demo"
+JENKINS_JOB_NAME="validation"
 DB_IP_PORT=""
 NEXUS_PROXY=""
 JENKINS_PROXY=""
+CERTDIR=$(pwd)
 
 for ARGUMENT in "$@"
 do
@@ -49,6 +52,7 @@ do
             CONTAINER_NAME)    CONTAINER_NAME=${VALUE} ;;
             NEXUS_PROXY) NEXUS_PROXY=${VALUE} ;;
             JENKINS_PROXY) JENKINS_PROXY=${VALUE} ;;
+            CERTDIR) CERTDIR=${VALUE} ;;
             *)
     esac
 done
@@ -65,30 +69,6 @@ if [ -z "$MARIADB_AKRAINO_PASSWORD" ]
     exit 1
 fi
 
-if [ -z "$JENKINS_URL" ]
-  then
-    echo "ERROR: You must specify the Jenkins Url"
-    exit 1
-fi
-
-if [ -z "$JENKINS_USERNAME" ]
-  then
-    echo "ERROR: You must specify the Jenkins username"
-    exit 1
-fi
-
-if [ -z "$JENKINS_USER_PASSWORD" ]
-  then
-    echo "ERROR: You must specify the Jenkins user password"
-    exit 1
-fi
-
-if [ -z "$JENKINS_JOB_NAME" ]
-  then
-    echo "ERROR: You must specify the Jenkins job name"
-    exit 1
-fi
-
 IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
-docker run --detach --name $CONTAINER_NAME --network="host" -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 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
 sleep 10