diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/common/shared/testserver/docker_testserver.sh | |
parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/common/shared/testserver/docker_testserver.sh')
-rwxr-xr-x | coin/provisioning/common/shared/testserver/docker_testserver.sh | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/coin/provisioning/common/shared/testserver/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh index 83baa488..3a7c87e8 100755 --- a/coin/provisioning/common/shared/testserver/docker_testserver.sh +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -53,28 +53,5 @@ 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. - [ -x "$(command -v sha1sum)" ] || SHASUM=shasum - - find "$@" -type f -print0 | \ - xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ - sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 -} - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. - -source "$SERVER_PATH/settings.sh" - -for server in $testserver -do - context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context -done - -docker images +# Create images +$SERVER_PATH/docker_images.sh |