lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-25 14:17:50 +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

4
coin/provisioning/common/linux/docker.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## 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.
@@ -52,4 +52,4 @@ sudo chmod +x /usr/local/bin/docker-compose
sudo apt-get install avahi-daemon -y
# Start testserver provisioning
source "${BASH_SOURCE%/*}/docker_testserver.sh"
sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"