diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-10-30 09:28:33 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-10-30 09:28:33 +0100 |
| commit | a91572b7f39038d960fc567859f2b2c7442ca5a7 (patch) | |
| tree | c1cb61876f264d9f373ea7716fc0a81757b214d8 /autotest.sh | |
| parent | 0c1a8c953aba8968301f0871a607d5abcf7b3003 (diff) | |
| download | nextcloud-server-a91572b7f39038d960fc567859f2b2c7442ca5a7.tar.gz nextcloud-server-a91572b7f39038d960fc567859f2b2c7442ca5a7.zip | |
Use proper statement to retrieve the IP of an docker instance
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/autotest.sh b/autotest.sh index 460fa9e38b1..f0efc45ccca 100755 --- a/autotest.sh +++ b/autotest.sh @@ -190,7 +190,7 @@ function execute_tests { -e MYSQL_PASSWORD=owncloud \ -e MYSQL_DATABASE="$DATABASENAME" \ -d rullzer/mariadb-owncloud) - DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) + DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") echo "Waiting for MariaDB initialisation ..." @@ -215,7 +215,7 @@ function execute_tests { if [ ! -z "$USEDOCKER" ] ; then echo "Fire up the postgres docker" DOCKER_CONTAINER_ID=$(docker run -e POSTGRES_USER="$DATABASEUSER" -e POSTGRES_PASSWORD=owncloud -d postgres) - DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) + DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") echo "Waiting for Postgres initialisation ..." @@ -230,7 +230,7 @@ function execute_tests { if [ "$DB" == "oci" ] ; then echo "Fire up the oracle docker" DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g) - DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) + DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") echo "Waiting for Oracle initialization ... " |