lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-23 13:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move and merge the provisioning scripts of docker to a shared folder

Browse Source 
To reuse the provisioning scripts for all platforms, they are moved to a
shared folder (coin/common/shared/testserver). The scripts of macOS and
linux are combined and controlled by an input parameter (macos/linux).

Change-Id: Ibf9a438d1825d01d707c2fc8fbcf2bc70a8b4902
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Ryan Chu
2019-01-15 10:37:06 +01:00
committed by Liang Qi
parent 1830cca2bc
commit b97e448ba4
5 changed files with 31 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
coin/provisioning/common/shared/testserver/testserver_util.sh → coin/provisioning/common/shared/testserver/docker_testserver.sh Normal file → Executable file
View File

@@ -1,6 +1,8 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +35,39 @@
set -ex
case ${BASH_SOURCE[0]} in
*/*) SERVER_PATH="${BASH_SOURCE[0]%/*}" ;;
*) SERVER_PATH="." ;;
esac
# Create docker virtual machine (Boot2docker)
case $1 in
VMX) source "$SERVER_PATH/docker_machine.sh" ;;
*) ;;
esac
# 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 | cut -d ' ' -f 1 | \
sort | shasum | cut -d ' ' -f 1
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