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 /apps/files_external/tests/env | |
| 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 'apps/files_external/tests/env')
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh index ad0fedba989..3b4a15da92a 100755 --- a/apps/files_external/tests/env/start-amazons3-ceph.sh +++ b/apps/files_external/tests/env/start-amazons3-ceph.sh @@ -41,7 +41,7 @@ container=`docker run -d \ -e RGW_CIVETWEB_PORT=$port \ ${docker_image}` -host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4` +host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` echo "${docker_image} container: $container" diff --git a/apps/files_external/tests/env/start-ftp-morrisjobke.sh b/apps/files_external/tests/env/start-ftp-morrisjobke.sh index 14112d7f803..f1ab7f69952 100755 --- a/apps/files_external/tests/env/start-ftp-morrisjobke.sh +++ b/apps/files_external/tests/env/start-ftp-morrisjobke.sh @@ -34,7 +34,7 @@ password=12345 container=`docker run -d -e USERNAME=$user -e PASSWORD=$password morrisjobke/docker-proftpd` -host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4` +host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` cat > $thisFolder/config.ftp.php <<DELIM <?php diff --git a/apps/files_external/tests/env/start-sftp-atmoz.sh b/apps/files_external/tests/env/start-sftp-atmoz.sh index 91eb5747c54..bebc7289250 100755 --- a/apps/files_external/tests/env/start-sftp-atmoz.sh +++ b/apps/files_external/tests/env/start-sftp-atmoz.sh @@ -34,7 +34,7 @@ password=12345 container=`docker run -d atmoz/sftp $user:$password:1001` -host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4` +host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` cat > $thisFolder/config.sftp.php <<DELIM <?php diff --git a/apps/files_external/tests/env/start-smb-silvershell.sh b/apps/files_external/tests/env/start-smb-silvershell.sh index c45807cc4c8..41ba3b11a70 100755 --- a/apps/files_external/tests/env/start-smb-silvershell.sh +++ b/apps/files_external/tests/env/start-smb-silvershell.sh @@ -31,7 +31,7 @@ fi; container=`docker run -d -e SMB_USER=test -e SMB_PWD=test silvershell/samba` -host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4` +host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` cat > $thisFolder/config.smb.php <<DELIM <?php |