diff options
| author |   dyh <dengyuanhong@chinamobile.com> | 2020-08-07 11:57:03 +0800 |
|---|---|---|
| committer | dyh <dengyuanhong@chinamobile.com> | 2020-08-10 14:31:18 +0800 |
| commit | 8d7d0c8830bf1c28a726b30069b8c9ede37c8ff2 (patch) | |
| tree | 0fcfe63a71693d5bd050c5e570c5f2d7311cbf16 /res/docker/docker-entrypoint.sh | |
| parent | 6315fd304c902ed41a5b1113ec89a04dc9c1162d (diff) | |
Don't modify the config file with sed in the docker entrypoint script
Change-Id: I71d86943f9a0c0175b9f7b2669511ec9a35fb2d6
Issue-ID: VFC-1623
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'res/docker/docker-entrypoint.sh')
| -rwxr-xr-x | res/docker/docker-entrypoint.sh | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/res/docker/docker-entrypoint.sh b/res/docker/docker-entrypoint.sh index 0f85abd..a1e7683 100755 --- a/res/docker/docker-entrypoint.sh +++ b/res/docker/docker-entrypoint.sh @@ -1,42 +1,8 @@ #!/bin/bash -if [ -z "$SERVICE_IP" ]; then - export SERVICE_IP=`hostname -i` -fi -echo "SERVICE_IP=$SERVICE_IP" - -if [ -z "$MSB_ADDR" ]; then - echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>" - exit 1 -fi -echo "MSB_ADDR=$MSB_ADDR" - -if [ -z "$MYSQL_ADDR" ]; then - echo "Missing required variable MYSQL_ADDR: <ip>:<port>" - exit 1 -fi -echo "MYSQL_ADDR=$MYSQL_ADDR" - -# Wait for MSB initialization -echo "Wait for MSB initialization" -for i in {1..5}; do - curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null - res=$? - if [ $res -ne 0 ]; then - break - fi - sleep $i -done - -# Wait for DB initialization -echo "Wait for DB initialization" -for i in {1..5}; do - mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -h`echo $MYSQL_ADDR | cut -d: -f 1` -P`echo $MYSQL_ADDR | cut -d: -f 2` -e "show databases;" > /dev/null && echo "DB initialization completed" && break - sleep $i && echo "`echo $MYSQL_ADDR | cut -d: -f 1` connection failed" -done - # Configure service based on docker environment variables -vfc/gvnfm/vnfres/res/docker/instance_config.sh +python vfc/gvnfm/vnfres/res/res/pub/config/config.py +cat vfc/gvnfm/vnfres/res/res/pub/config/config.py # microservice-specific one-time initialization vfc/gvnfm/vnfres/res/docker/instance_init.sh |