mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-24 21:57:45 +08:00
Split docker provisioning files
Split the creation of the test images and the creation of the docker environment. This way, one can easily recreate the test images, without requiring to re-provision everything. Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Ryan Chu <ryan.chu@qt.io>
This commit is contained in:
committed by
Liang Qi
parent
ca9f9b9cc4
commit
3d087c5a6a
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user