Fix the docker build error for vfc-nfvo-wfengine

Change-Id: Ifb561a09f482e9a83f42dc2d43f3d88874bbde36
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>

diff --git a/activiti-extension/src/main/docker/Dockerfile b/activiti-extension/src/main/docker/Dockerfile
index 23607b3..f0f8647 100644 (file)
--- a/activiti-extension/src/main/docker/Dockerfile
+++ b/activiti-extension/src/main/docker/Dockerfile
@@ -1,7 +1,6 @@
 FROM openjdk:8-jre-alpine
 LABEL maintainer=Zhaoxing(mzhx.meng@gmail.com)
 
-ENV OPENPALETTE_MSB_IP=127.0.0.1 OPENPALETTE_MSB_PORT=80 SCHEMA_UPDATE_INIT=false
 WORKDIR /home/onap/workflow/wfengineactiviti
 EXPOSE 8080
 

diff --git a/activiti-extension/src/main/docker/activiti-docker-build_image.sh b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
index 7b309d1..17a8971 100644 (file)
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -53,11 +53,11 @@ rm -Rf activiti-extension*.jar
 rm -Rf activiti-rest.war
 
 
-echo "download Tomcat 8.5.20"
+echo "download Tomcat 8.5.23"
 #curl "${CURLPROXY}" -m 300 -O -J -L  "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz"
-wget  "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz"
-tar -zxf apache-tomcat-8.5.20.tar.gz
-mv apache-tomcat-8.5.20 apache-tomcat
+wget  "http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz"
+tar -zxf apache-tomcat-8.5.23.tar.gz
+mv apache-tomcat-8.5.23 apache-tomcat
 
 echo "download Activiti 5.22.0"
 wget "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip"

diff --git a/activiti-extension/src/main/docker/bin/entrypoint.sh b/activiti-extension/src/main/docker/bin/entrypoint.sh
index e6f6c96..7c5af09 100644 (file)
--- a/activiti-extension/src/main/docker/bin/entrypoint.sh
+++ b/activiti-extension/src/main/docker/bin/entrypoint.sh
@@ -3,13 +3,43 @@
 # $1, $2, $3 etc are passed arguments
 # $1 is our command
 CMD=$1
+
+if [ -z "$SERVICE_IP" ]; then
+    export SERVICE_IP=`hostname -i`
+fi
+echo "SERVICE_IP=$SERVICE_IP"
+
+if [ -z "$SERVICE_PORT" ]; then
+    export SERVICE_PORT=8080
+fi
+echo "SERVICE_PORT=$SERVICE_PORT"
+
+if [ -z "$OPENPALETTE_MSB_IP" ]; then
+    echo "Missing required variable OPENPALETTE_MSB_IP: Microservices Service Bus address <ip>:<port>"
+    exit 1
+fi
+if [ -z "$OPENPALETTE_MSB_PORT" ]; then
+    echo "Missing required variable OPENPALETTE_MSB_PORT: Microservices Service Bus address <ip>:<port>"
+    exit 1
+fi
+echo "MSB_ADDR=${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}"
+
+# Wait for MSB initialization
+echo "Wait for MSB initialization"
+for i in {1..5}; do
+    curl -sS -m 1 ${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT} > /dev/null && break
+    sleep $i
+done
+
+curl -X POST --data '{"serviceName": "activiti-rest","version": "v1","url": "/activiti-rest/","path": "/activiti-rest/","protocol": "REST","visualRange": "1","nodes": [{"ip": "${SERVICE_IP}","port": "${SERVICE_PORT}","ttl": 0}]}' http://${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}/api/microservices/v1/services -H "Accept: Application/json" -H "Content-Type:application/json"
+
 case "$CMD" in  
   "dev" )
     ;;
   "start" )
     # we can modify files here, using ENV variables passed in 
     # "docker create" command. It can't be done during build process.
-    exec ./bin/startup.sh
+    exec ./catalina.sh run
     ;;
    * )
     # Run custom command. Thanks to this line we can still use 

diff --git a/wfenginemgrservice/src/main/docker/Dockerfile b/wfenginemgrservice/src/main/docker/Dockerfile
index f0bdb3a..1432005 100644 (file)
--- a/wfenginemgrservice/src/main/docker/Dockerfile
+++ b/wfenginemgrservice/src/main/docker/Dockerfile
@@ -1,13 +1,12 @@
-FROM openjdk:8-jre-alpine
-LABEL maintainer=Zhaoxing(mzhx.meng@gmail.com)
-
-ENV OPENPALETTE_MSB_IP=127.0.0.1 OPENPALETTE_MSB_PORT=80
-WORKDIR /home/onap/workflow/wfenginemgrservice
-EXPOSE 10550
-
-ADD bin /home/onap/workflow/wfenginemgrservice/
-RUN chmod 755 /home/onap/workflow/wfenginemgrservice/*.sh
-
-ENTRYPOINT ["./entrypoint.sh"]  
-CMD ["start"]
-
+FROM openjdk:8-jre-alpine\r
+LABEL maintainer=Zhaoxing(mzhx.meng@gmail.com)\r
+\r
+WORKDIR /home/onap/workflow/wfenginemgrservice\r
+EXPOSE 10550\r
+\r
+ADD bin /home/onap/workflow/wfenginemgrservice/\r
+RUN chmod 755 /home/onap/workflow/wfenginemgrservice/*.sh\r
+\r
+ENTRYPOINT ["./entrypoint.sh"]  \r
+CMD ["start"]\r
+\r

diff --git a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh
index f5d8d8c..2a610c0 100644 (file)
--- a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh
+++ b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh
@@ -3,6 +3,36 @@
 # $1, $2, $3 etc are passed arguments
 # $1 is our command
 CMD=$1
+
+if [ -z "$SERVICE_IP" ]; then
+    export SERVICE_IP=`hostname -i`
+fi
+echo "SERVICE_IP=$SERVICE_IP"
+
+if [ -z "$SERVICE_PORT" ]; then
+    export SERVICE_PORT=10550
+fi
+echo "SERVICE_PORT=$SERVICE_PORT"
+
+if [ -z "$OPENPALETTE_MSB_IP" ]; then
+    echo "Missing required variable OPENPALETTE_MSB_IP: Microservices Service Bus address <ip>:<port>"
+    exit 1
+fi
+if [ -z "$OPENPALETTE_MSB_PORT" ]; then
+    echo "Missing required variable OPENPALETTE_MSB_PORT: Microservices Service Bus address <ip>:<port>"
+    exit 1
+fi
+echo "MSB_ADDR=${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}"
+
+# Wait for MSB initialization
+echo "Wait for MSB initialization"
+for i in {1..5}; do
+    curl -sS -m 1 ${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT} > /dev/null && break
+    sleep $i
+done
+
+curl -X POST --data '{"serviceName": "workflow","version": "v1","url": "/api/workflow/v1/","protocol": "REST","visualRange": "1","nodes": [{"ip": "${SERVICE_IP}","port": "${SERVICE_PORT}","ttl": 0}]}' http://${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT}/api/microservices/v1/services -H "Accept: Application/json" -H "Content-Type:application/json"
+
 case "$CMD" in  
   "dev" )
     ;;