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

Merge remote-tracking branch 'origin/5.14' into 5.15

Browse Source 
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
This commit is contained in:
Liang Qi
2019-12-05 14:47:57 +01:00
parent 7c1c98e123 e4f9ac5607
commit 4282752c19
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coin/provisioning/common/shared/testserver/docker_images.sh
View File

@@ -51,18 +51,20 @@ sha1tree () {
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.
# A tag labels a specific image version. In the docker compose file
# (docker-compose.yml) that launches the containers, the tag used is
# "latest". Here the images are also tagged with the SHA1 of each server
# context, so if needed we can modify docker-compose.yml to launch a very
# specific image, thus providing a way to stage backwards-incompatible changes
# across repositories.
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
docker build -t qt-test-server-$server:$(sha1tree $context) $context
tag=$(sha1tree $context)
docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
done
docker images