diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2019-01-15 10:37:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-02 12:23:11 +0000 |
| commit | ab3e34827a69d936aa02757033b6a00be5003493 (patch) | |
| tree | 670cd990f24f74a439343c647e6359c1ae699e37 /coin | |
| parent | b97e448ba47a5272424cdf8c779691013b967a00 (diff) | |
Display the provisioned version of docker tool kits
For debug purpose, print the installed version of docker,
docker-compose, and docker-engine. Because 'docker info' is related to
the docker-engine, postpone calling the command until docker virtual
machine has been created.
Change-Id: I4c869b7122b831b7f22c9c3846ac9cbe47c3b355
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/common/linux/docker.sh | 3 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/docker.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/shared/testserver/docker_testserver.sh | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index d5cf202c..9be84e38 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -42,11 +42,12 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun sudo apt-get update sudo apt-get install docker-ce -y sudo usermod -a -G docker $USER -sudo docker info +sudo docker --version # Download and install the docker-compose extension. sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose +sudo docker-compose --version # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh index 086ef817..5ad7dcba 100755 --- a/coin/provisioning/common/macos/docker.sh +++ b/coin/provisioning/common/macos/docker.sh @@ -58,6 +58,8 @@ else curl $url -o $target_file fi sudo installer -pkg $target_file -target / +docker --version +docker-compose --version # Start testserver provisioning case ${BASH_SOURCE[0]} in diff --git a/coin/provisioning/common/shared/testserver/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh index 2807b488..c40edf17 100755 --- a/coin/provisioning/common/shared/testserver/docker_testserver.sh +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -46,6 +46,9 @@ case $1 in *) ;; esac +# Display system-wide information of docker-engine +docker info + # Sort files by their SHA-1, and then return the accumulated result sha1tree () { # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. |