diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-26 16:53:01 +0800 |
|---|---|---|
| committer | Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-10-26 16:56:39 +0800 |
| commit | 0617813c3a43bd113d4e0a6dce294618fb5e9734 (patch) | |
| tree | c07a395a79872012afa75bd0ced39253ffce0327 | |
| parent | 3c1091fd34ddc8009e97c6cc26e52893365d2256 (diff) | |
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: Ic111205c0d81d13ad9a354a4e1290e05ce65cd43
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
| -rw-r--r-- | wfenginemgrservice/src/main/docker/bin/entrypoint.sh | 2 | ||||
| -rw-r--r-- | wfenginemgrservice/src/main/docker/bin/run.sh | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh index 0d056f7..5c8dcd2 100644 --- a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh +++ b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh @@ -41,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 ./run.sh + exec ./run.sh ${OPENPALETTE_MSB_IP} ${OPENPALETTE_MSB_PORT} ;; * ) # Run custom command. Thanks to this line we can still use diff --git a/wfenginemgrservice/src/main/docker/bin/run.sh b/wfenginemgrservice/src/main/docker/bin/run.sh index 002ed1b..4ce6078 100644 --- a/wfenginemgrservice/src/main/docker/bin/run.sh +++ b/wfenginemgrservice/src/main/docker/bin/run.sh @@ -18,6 +18,21 @@ DIRNAME=`dirname $0` RUNHOME=`cd $DIRNAME/; pwd` echo @RUNHOME@ $RUNHOME +if [ -z "$1" ]; then + dwApp_msbClientConfig_msbSvrIp="127.0.0.1" +elif [ "$OPENPALETTE_MSB_IP" ]; then + dwApp_msbClientConfig_msbSvrIp=$OPENPALETTE_MSB_IP +else + dwApp_msbClientConfig_msbSvrIp=$1 +fi +if [ -z "$2" ]; then + dwApp_msbClientConfig_msbSvrPort="80" +elif [ "$OPENPALETTE_MSB_PORT" ]; then + dwApp_msbClientConfig_msbSvrPort=$OPENPALETTE_MSB_PORT +else + dwApp_msbClientConfig_msbSvrPort=$2 +fi +echo " dwApp_MSB_ADDR=${dwApp_msbClientConfig_msbSvrIp}:${dwApp_msbClientConfig_msbSvrPort}" if [ -f "$RUNHOME/setenv.sh" ]; then . "$RUNHOME/setenv.sh" @@ -49,6 +64,8 @@ echo @CLASS_PATH@ $CLASS_PATH echo @EXT_DIRS@ $EXT_DIRS echo ========================================================================== +echo `env` + echo @JAVA@ $JAVA echo @JAVA_CMD@ "$JAVA" $JAVA_OPTS -classpath "$CLASS_PATH" $Main_Class server "$RUNHOME/$Main_Conf" |