aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/linux/docker.sh
diff options
context:
space:
mode:
authorRyan Chu <ryan.chu@qt.io>2018-10-01 10:38:39 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-30 08:15:43 +0000
commitea76ace8257d98a8c6d72fca39b1f7f559f084cb (patch)
tree443a6b56de42052ecca1c3c87c31bfefd53fb3fb /coin/provisioning/common/linux/docker.sh
parenta76e315034d12f85a7a5281f1384375d2fb4ae3b (diff)
Docker Provisioning: Install Docker-based test servers on macOS
Build and cache docker images based on the configurations in testserver. 1. Move the shared Docker files to common/shared/testserver 2. Deploy boot2docker image into VirtualBox via docker-machine commands. 3. Build and tag the docker images by the SHA-1 of server context. Change-Id: Ic5a588e5cc5e753ec4c4e2e1bc79917bbd03f95d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'coin/provisioning/common/linux/docker.sh')
-rwxr-xr-xcoin/provisioning/common/linux/docker.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh
index 16af0a0a..07cedba9 100755
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -49,4 +49,4 @@ sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-c
sudo chmod +x /usr/local/bin/docker-compose
# Start testserver provisioning
-source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"
+source "${BASH_SOURCE%/*}/docker_testserver.sh"