diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-11 17:05:42 +0800 |
|---|---|---|
| committer | Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-11 17:05:42 +0800 |
| commit | f55132f49d1dbe3bd24924a7edbcbd6ba6e16704 (patch) | |
| tree | 10087d7d332ef995b4584940a945c43a54da413f /activiti-extension/src/main/docker/bin | |
| parent | 3cdda39ed8b4f10b9e0fcb9900acf09d426ccffc (diff) | |
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: I40eef979522ec2eac5913e1544e98d3a1d00aa3f
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Diffstat (limited to 'activiti-extension/src/main/docker/bin')
| -rw-r--r-- | activiti-extension/src/main/docker/bin/entrypoint.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activiti-extension/src/main/docker/bin/entrypoint.sh b/activiti-extension/src/main/docker/bin/entrypoint.sh index 7c5af09..eb384d9 100644 --- a/activiti-extension/src/main/docker/bin/entrypoint.sh +++ b/activiti-extension/src/main/docker/bin/entrypoint.sh @@ -27,11 +27,13 @@ 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 + 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" +curldata='{"serviceName": "activiti-rest", "version": "v1", "url": "/activiti-rest","protocol": "REST", "visualRange": "1", "path": "/activiti-rest", "nodes": [ {"ip": "'$SERVICE_IP'","port": "'$SERVICE_PORT'","ttl": 0}]}' + +curl -v -X POST -H "Accept: Application/json" -H "Content-Type: application/json" -d "${curldata}" http://$OPENPALETTE_MSB_IP:$OPENPALETTE_MSB_PORT/api/microservices/v1/services case "$CMD" in "dev" ) @@ -39,7 +41,7 @@ case "$CMD" in "start" ) # we can modify files here, using ENV variables passed in # "docker create" command. It can't be done during build process. - exec ./catalina.sh run + exec ./bin/catalina.sh run ;; * ) # Run custom command. Thanks to this line we can still use |