diff options
| author |   liamfallon <liam.fallon@est.tech> | 2021-01-06 15:34:58 +0000 |
|---|---|---|
| committer |   S�bastien Determe <sebastien.determe@intl.att.com> | 2021-01-06 18:36:04 +0000 |
| commit | 79b5636be43054a0c2ec7ab2450edc347e1d5043 (patch) | |
| tree | 5c1947c4f0639e0d1c4816fe841d286677a31637 /extra/bin-for-dev | |
| parent | b6d7a6d192eddc0c52497603023e47f10599c2ae (diff) | |
Merge clamp master into tosca-poc branch
This change mreges changes in clamp master into the tosca-poc branch
because the two banches have diverged.
Issue-ID: POLICY-2971
Change-Id: Iea4efe90204c98eeaae0b112ad5c964f722afdb0
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'extra/bin-for-dev')
| -rwxr-xr-x | extra/bin-for-dev/start-db.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/bin-for-dev/start-db.sh b/extra/bin-for-dev/start-db.sh index 99286fccb..97f8de1f5 100755 --- a/extra/bin-for-dev/start-db.sh +++ b/extra/bin-for-dev/start-db.sh @@ -26,7 +26,7 @@ docker-compose -f ../docker/clamp/docker-compose.yml up -d db if [ "$1" = "test" ]; then - while ! (docker logs clamp_db_1 2>&1 | grep "socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution" > /dev/null); + while ! (docker logs clamp_db_1 2>&1 | grep "socket: '/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution" > /dev/null); do echo "Waiting Mysql to be up with CLDSDB4 db loaded before loading the TEST DATA ..." sleep 3 |