Code Review
/
validation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
docker: manifest push: Ignore missing images
[validation.git]
/
docker
/
ui
/
deploy.sh
diff --git
a/docker/ui/deploy.sh
b/docker/ui/deploy.sh
index
43bd5bc
..
faab064
100755
(executable)
--- 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
TAG_PRE=ui
TAG_VER=latest
# Container input parameters
-M
ARIADB
_AKRAINO_PASSWORD=""
+M
YSQL
_AKRAINO_PASSWORD=""
JENKINS_URL="https://jenkins.akraino.org/"
JENKINS_USERNAME="demo"
JENKINS_USER_PASSWORD="demo"
JENKINS_URL="https://jenkins.akraino.org/"
JENKINS_USERNAME="demo"
JENKINS_USER_PASSWORD="demo"
@@
-34,6
+34,8
@@
NEXUS_PROXY=""
JENKINS_PROXY=""
CERTDIR=$(pwd)
ENCRYPTION_KEY=""
JENKINS_PROXY=""
CERTDIR=$(pwd)
ENCRYPTION_KEY=""
+UI_ADMIN_PASSWORD=""
+UI_AKRAINO_PASSWORD=""
for ARGUMENT in "$@"
do
for ARGUMENT in "$@"
do
@@
-44,7
+46,7
@@
do
NAME) NAME=${VALUE} ;;
TAG_PRE) TAG_PRE=${VALUE} ;;
TAG_VER) TAG_VER=${VALUE} ;;
NAME) NAME=${VALUE} ;;
TAG_PRE) TAG_PRE=${VALUE} ;;
TAG_VER) TAG_VER=${VALUE} ;;
- M
ARIADB_AKRAINO_PASSWORD) MARIADB
_AKRAINO_PASSWORD=${VALUE} ;;
+ M
YSQL_AKRAINO_PASSWORD) MYSQL
_AKRAINO_PASSWORD=${VALUE} ;;
JENKINS_URL) JENKINS_URL=${VALUE} ;;
JENKINS_USERNAME) JENKINS_USERNAME=${VALUE} ;;
JENKINS_USER_PASSWORD) JENKINS_USER_PASSWORD=${VALUE} ;;
JENKINS_URL) JENKINS_URL=${VALUE} ;;
JENKINS_USERNAME) JENKINS_USERNAME=${VALUE} ;;
JENKINS_USER_PASSWORD) JENKINS_USER_PASSWORD=${VALUE} ;;
@@
-55,6
+57,8
@@
do
JENKINS_PROXY) JENKINS_PROXY=${VALUE} ;;
CERTDIR) CERTDIR=${VALUE} ;;
ENCRYPTION_KEY) ENCRYPTION_KEY=${VALUE} ;;
JENKINS_PROXY) JENKINS_PROXY=${VALUE} ;;
CERTDIR) CERTDIR=${VALUE} ;;
ENCRYPTION_KEY) ENCRYPTION_KEY=${VALUE} ;;
+ UI_ADMIN_PASSWORD) UI_ADMIN_PASSWORD=${VALUE} ;;
+ UI_AKRAINO_PASSWORD) UI_AKRAINO_PASSWORD=${VALUE} ;;
*)
esac
done
*)
esac
done
@@
-65,9
+69,9
@@
if [ -z "$DB_IP_PORT" ]
exit 1
fi
exit 1
fi
-if [ -z "$M
ARIADB
_AKRAINO_PASSWORD" ]
+if [ -z "$M
YSQL
_AKRAINO_PASSWORD" ]
then
then
- echo "ERROR: You must specify the m
ariadb
akraino user password"
+ echo "ERROR: You must specify the m
ysql
akraino user password"
exit 1
fi
exit 1
fi
@@
-77,6
+81,18
@@
if [ -z "$ENCRYPTION_KEY" ]
exit 1
fi
exit 1
fi
+if [ -z "$UI_ADMIN_PASSWORD" ]
+ then
+ echo "ERROR: You must specify the UI admin password"
+ exit 1
+fi
+
+if [ -z "$UI_AKRAINO_PASSWORD" ]
+ then
+ echo "ERROR: You must specify the UI akraino password"
+ exit 1
+fi
+
IMAGE="$REGISTRY"/"$NAME":"$TAG_PRE"-"$TAG_VER"
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 M
ARIADB_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" -e ENCRYPTION_KEY="$ENCRYPTION_KEY
" $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 M
YSQL_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" -e UI_AKRAINO_PASSWORD="$UI_AKRAINO_PASSWORD
" $IMAGE
sleep 10
sleep 10