diff options
| -rwxr-xr-x | docker/docker-entrypoint.sh | 4 | ||||
| -rwxr-xr-x | docker/instance_init.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 12a67b7e..624e3d31 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -23,8 +23,8 @@ 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=$i? + curl -sS -m 1 $MSB_PROTO://$MSB_ADDR/msb -k > /dev/null + res=$? if [ $res -ne 0 ]; then break fi diff --git a/docker/instance_init.sh b/docker/instance_init.sh index 03ea1d9e..828cbf5a 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -3,12 +3,12 @@ MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1` MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2` -if [ $MYSQL_AUTH ]; then - MYSQL_ROOT_USER=`echo $MYSQL_AUTH | cut -d: -f 1` - MYSQL_ROOT_PASSWORD=`echo $MYSQL_AUTH | cut -d: -f 2` +if [ $MYSQL_ROOT_USER ] && [ $MYSQL_ROOT_PASSWORD ]; then + MYSQL_ROOT_USER=$MYSQL_ROOT_USER + MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD else - MYSQL_ROOT_USER="root" - MYSQL_ROOT_PASSWORD="root" + MYSQL_ROOT_USER="root" + MYSQL_ROOT_PASSWORD="root" fi function create_database { |