diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-10 14:22:59 +0800 |
|---|---|---|
| committer | Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-10 14:22:59 +0800 |
| commit | 02aaa54fea0fd1b7cee286def51d2e7da1abc0c5 (patch) | |
| tree | f2097782d6c50d0e0472bb5f44712acd3104b065 /wfenginemgrservice/src | |
| parent | b15b381c5fa631699c1a3d27e482d3d77bed6ad8 (diff) | |
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>
Diffstat (limited to 'wfenginemgrservice/src')
| -rw-r--r-- | wfenginemgrservice/src/main/docker/Dockerfile | 25 | ||||
| -rw-r--r-- | wfenginemgrservice/src/main/docker/bin/entrypoint.sh | 30 |
2 files changed, 42 insertions, 13 deletions
diff --git a/wfenginemgrservice/src/main/docker/Dockerfile b/wfenginemgrservice/src/main/docker/Dockerfile index f0bdb3a..1432005 100644 --- 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
+LABEL maintainer=Zhaoxing(mzhx.meng@gmail.com)
+
+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"]
+
diff --git a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh index f5d8d8c..2a610c0 100644 --- 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" ) ;; |